Skip to content

I
ims
提交 5172259c 作者: 刘明祎-运维用途
操作

新增接口金额明细

上级 52e18bad
流水线 #7284 已通过 于阶段
in 2 分 56 秒
正在显示 包含 74 行增加 和 29 行删除
release-service/src/main/java/com/mmc/csf/release/controller/BackRequirementsController.java
......@@ -13,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @Author small
......@@ -52,15 +53,15 @@ public class BackRequirementsController extends BaseController {
@ApiOperation(value = "后台订单——修改金额明细")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("updateOrderAmountDetails")
public ResultBody updateOrderAmountDetails(@RequestBody OrderAmountDetailDO orderAmountDetailDO) {
return backRequirementsService.updateOrderAmountDetails(orderAmountDetailDO);
public ResultBody updateOrderAmountDetails(@RequestBody List<OrderAmountDetailDO> list) {
return backRequirementsService.updateOrderAmountDetails(list);
}
@ApiOperation(value = "后台订单——新增金额明细")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("insertOrderAmountDetails")
public ResultBody insertOrderAmountDetails(@RequestBody OrderAmountDetailDO orderAmountDetailDO) {
return backRequirementsService.insertOrderAmountDetails(orderAmountDetailDO);
public ResultBody insertOrderAmountDetails(@RequestBody List<OrderAmountDetailDO> list) {
return backRequirementsService.insertOrderAmountDetails(list);
}
}
release-service/src/main/java/com/mmc/csf/release/dao/OrderAmountDetailDao.java
......@@ -14,12 +14,34 @@ import java.util.List;
@Mapper
public interface OrderAmountDetailDao {
int deleteByPrimaryKey(Integer id);
int deleteByPrimaryKey(Integer requirementsInfoId);
/**
* 新增
* @param record
* @return int
*/
int insert(OrderAmountDetailDO record);
/**
* 选择性新增
* @param record 新增实体类
* @return int
*/
int insertSelective(OrderAmountDetailDO record);
/**
* 批量新增
* @param list 新增列表
*/
void batchInsert(List<OrderAmountDetailDO> list);
/**
* 根据订单id查询该订单金额明细
* @param requirementsInfoId 订单id
* @return {@link List}<{@link OrderAmountDetailDO}>
*/
List<OrderAmountDetailDO> selectByPrimaryKey(Integer requirementsInfoId);
int updateByPrimaryKeySelective(OrderAmountDetailDO record);
......
release-service/src/main/java/com/mmc/csf/release/service/BackRequirementsService.java
......@@ -6,6 +6,8 @@ import com.mmc.csf.infomation.qo.ServiceOrderQO;
import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
import com.mmc.csf.release.entity.requirements.OrderAmountDetailDO;
import java.util.List;
/**
* @Author small
* @Date 2023/8/29 10:19
......@@ -24,17 +26,17 @@ public interface BackRequirementsService {
ResultBody getOrderAmountDetails(Integer requirementsInfoId);
/**
* 修改
* @param orderAmountDetailDO
* 先删除之前的默认数据 再新增
* @param list
* @return {@link ResultBody}
*/
ResultBody updateOrderAmountDetails(OrderAmountDetailDO orderAmountDetailDO);
ResultBody updateOrderAmountDetails(List<OrderAmountDetailDO> list);
/**
* 添加
* @param orderAmountDetailDO
* 批量添加
* @param list 列表
* @return {@link ResultBody}
*/
ResultBody insertOrderAmountDetails(OrderAmountDetailDO orderAmountDetailDO);
ResultBody insertOrderAmountDetails(List<OrderAmountDetailDO> list);
}
release-service/src/main/java/com/mmc/csf/release/service/impl/BackRequirementsServiceImpl.java
......@@ -43,7 +43,7 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
@Override
public PageResult serviceOrderFormList(ServiceOrderQO param, LoginSuccessDTO userLoginInfoFromRedis) {
//权限限制，除了admin以外其他飞手团队后台账号只能看到自己团队里面飞手接的订单
//权限限制，除了admin以外其他飞手团队后台账号只能看到自己团队里面飞手发的订单
Integer userAccountId = userLoginInfoFromRedis.getUserAccountId();
List<Integer> pilotUserIdList = null;
if(userAccountId != 1) {
......@@ -97,14 +97,16 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
}
@Override
public ResultBody updateOrderAmountDetails(OrderAmountDetailDO orderAmountDetailDO) {
orderAmountDetailDao.updateByPrimaryKeySelective(orderAmountDetailDO);
public ResultBody updateOrderAmountDetails(List<OrderAmountDetailDO> list) {
//删除掉默认的一条数据
orderAmountDetailDao.deleteByPrimaryKey(list.get(0).getRequirementsInfoId());
orderAmountDetailDao.batchInsert(list);
return ResultBody.success();
}
@Override
public ResultBody insertOrderAmountDetails(OrderAmountDetailDO orderAmountDetailDO) {
orderAmountDetailDao.insertSelective(orderAmountDetailDO);
public ResultBody insertOrderAmountDetails(List<OrderAmountDetailDO> list) {
orderAmountDetailDao.batchInsert(list);
return ResultBody.success();
}
}
release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java
......@@ -13,6 +13,7 @@ import com.mmc.csf.infomation.qo.*;
import com.mmc.csf.infomation.vo.*;
import com.mmc.csf.release.constant.*;
import com.mmc.csf.release.controller.countDown.RedisUtil;
import com.mmc.csf.release.dao.OrderAmountDetailDao;
import com.mmc.csf.release.dao.RequirementsDao;
import com.mmc.csf.release.entity.requirements.*;
import com.mmc.csf.release.feign.PmsAppApi;
......@@ -21,14 +22,11 @@ import com.mmc.csf.release.industry.IndustryTypeDTO;
import com.mmc.csf.release.industry.UserPayInfoVO;
import com.mmc.csf.release.service.RequirementsService;
import com.mmc.csf.release.util.RestTemplateUtil;
import com.sun.xml.bind.v2.TODO;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.gavaghan.geodesy.Ellipsoid;
import org.gavaghan.geodesy.GeodeticCalculator;
import org.gavaghan.geodesy.GeodeticCurve;
import org.gavaghan.geodesy.GlobalCoordinates;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
......@@ -90,6 +88,9 @@ public class RequirementsServiceImpl implements RequirementsService {
@Autowired
private UserSystemConstant userSystemConstant;
@Autowired
private OrderAmountDetailDao orderAmountDetailDao;
@Override
public ResultBody listType(Integer id) {
List<RequirementsTypeDO> requirementsTypeDOList = requirementsDao.listTypeReq(id);
......@@ -2806,18 +2807,21 @@ public class RequirementsServiceImpl implements RequirementsService {
if (sum == 1) {
requirementsDao.insertPlatformOrderEarnings(new BigDecimal(0), requirementsInfoDO.getId(), 0);
} else {
//循环添加子订单
//添加子订单
for (int i = 0; i < sum; i++) {
//往requirements_info表添加数据
ServiceRequirementsSonDO requirementsSonDO = new ServiceRequirementsSonDO(requirementsInfoDO);
requirementsDao.addPublishServiceSon(requirementsSonDO);
System.out.println(requirementsSonDO);
//往requirements_amount表添加数据
RequirementsAmountDO requirementsAmountSonDO = new RequirementsAmountDO(requirementsSonDO);
System.out.println(requirementsAmountSonDO);
System.out.println("-------------------------");
requirementsDao.addAmount(requirementsAmountSonDO);
//向order_amout_detail给每个子订单添加详细信息
OrderAmountDetailDO orderAmountDetailDO = new OrderAmountDetailDO();
orderAmountDetailDO.setRequirementsInfoId(requirementsAmountSonDO.getId());
orderAmountDetailDO.setRealWages(requirementsAmountSonDO.getOrderAmount());
orderAmountDetailDO.setDailyWage(requirementsAmountSonDO.getOrderAmount());
orderAmountDetailDao.insertSelective(orderAmountDetailDO);
requirementsDao.insertPlatformOrderEarnings(new BigDecimal(0), requirementsSonDO.getId(), 0);
}
}
......
release-service/src/main/resources/application-local.yml
......@@ -145,7 +145,7 @@ iuav:
userapp:
url: http://localhost:35150
pmsapp:
url: http://pms-svc:8099
url: http://localhost:8099
omsapp:
url: http://localhost:8077/oms/
payment:
......
release-service/src/main/resources/mapper/requirements/OrderAmountDetailDao.xml
......@@ -26,9 +26,9 @@
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from order_amount_detail
where id = #{id,jdbcType=INTEGER}
where requirements_info_id = #{requirementsInfoId}
</delete>
<select id="selectByPrimaryKey" resultType="com.mmc.csf.release.entity.requirements.OrderAmountDetailDO">
select
......@@ -48,6 +48,20 @@
,#{highTemperatureSubsidy,jdbcType=DECIMAL},#{settleAccountsProportion,jdbcType=DECIMAL},#{realWages,jdbcType=DECIMAL}
,#{workDate,jdbcType=TIMESTAMP},NOW())
</insert>
<insert id="batchInsert" parameterType="java.util.List">
insert into order_amount_detail
(id, requirements_info_id, daily_wage, subsidy_festival, rental_subsidy, traffic_subsidy,
high_temperature_subsidy, settle_accounts_proportion, real_wages, work_date, create_time)
values
<foreach collection="list" item="item" separator=",">
(#{item.id}, #{item.requirementsInfoId}, #{item.dailyWage}, #{item.subsidyFestival}, #{item.rentalSubsidy},
#{item.trafficSubsidy}, #{item.highTemperatureSubsidy}, #{item.settleAccountsProportion}, #{item.realWages},
#{item.workDate}, NOW())
</foreach>
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mmc.csf.release.entity.requirements.OrderAmountDetailDO" useGeneratedKeys="true">
insert into order_amount_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论