RequirementsDao(update)

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -120,6 +120,8 @@ public interface RequirementsDao {
 
     RequirementsInfoDO publisherCancel(Integer requirementsInfoId, Integer userAccountId);
 
+    RequirementsInfoDO publisherCancelFlyers(Integer requirementsInfoId);
+
     RequirementsInfoDO customerPublisherCancel(Integer requirementsInfoId, Integer userAccountId);
 
     RequirementsInfoDO publisherCancelFlyer(Integer requirementsInfoId);

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -1534,7 +1534,7 @@ public class RequirementsServiceImpl implements RequirementsService {
 
     @Override
     public ResultBody confirmSettlement(Integer userAccountId, Integer requirementsInfoId,HttpServletRequest request) {
-        RequirementsInfoDO requirementsInfoDO = requirementsDao.publisherCancel(requirementsInfoId, userAccountId);
+        RequirementsInfoDO requirementsInfoDO = requirementsDao.publisherCancelFlyers(requirementsInfoId);
         ServiceSettleAccountsVO settleAccountsVO = new ServiceSettleAccountsVO();
         settleAccountsVO.setRequirementsInfoId(requirementsInfoId);
         RequirementsServiceDO serviceDO = requirementsDao.serviceSettleAccounts(settleAccountsVO);
@@ -1545,6 +1545,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         FlyerWalletFlowVO flyerWalletFlowVO = new FlyerWalletFlowVO();
         IsNullConvertZeroUtil.checkIsNull(flyerWalletFlowVO);
         IsNullConvertZeroUtil.checkIsNull(serviceDO);
+        IsNullConvertZeroUtil.checkIsNull(requirementsInfoDO);
 
         if (requirementsInfoDO == null) {
             return ResultBody.error("结算失败");
@@ -1554,8 +1555,8 @@ public class RequirementsServiceImpl implements RequirementsService {
         if (updateAmount!=null){
             //继续支付需要扣除金额
             IsNullConvertZeroUtil.checkIsNull(updateAmount);
-            publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount());
-            publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
+            publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount().negate());
+            publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount().negate());
             publisherWalletFlowVO.setUserAccountId(requirementsInfoDO.getUserAccountId());
             publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
             publisherWalletFlowVO.setModeOfPayment(1000);
@@ -1578,10 +1579,11 @@ public class RequirementsServiceImpl implements RequirementsService {
 
             //给飞手金额
             BigDecimal updateOrderAmount = updateAmount.getUpdateOrderAmount();
-            BigDecimal multiply = updateOrderAmount.multiply(new BigDecimal(0.9).setScale(2, BigDecimal.ROUND_HALF_UP));
+
+            BigDecimal multiply = updateOrderAmount.multiply(new BigDecimal(0.9)).setScale(2, BigDecimal.ROUND_HALF_UP);
             publisherWalletFlowVO.setFlyerSalaryAmount(multiply);
             //平台收益
-           earnings = updateOrderAmount.multiply(new BigDecimal(0.1).setScale(2, BigDecimal.ROUND_HALF_UP));
+           earnings = updateOrderAmount.multiply(new BigDecimal(0.1)).setScale(2, BigDecimal.ROUND_HALF_UP);
         }
 
         flyerWalletFlowVO.setSalaryAmount(serviceDO.getSalaryAmount());
@@ -1604,9 +1606,9 @@ public class RequirementsServiceImpl implements RequirementsService {
         walletFlowVO.setFlyerWalletFlowVO(flyerWalletFlowVO);
 
         flyerCancelNO(walletFlowVO,request.getHeader("token"));
-
-
-        requirementsDao.updateOrderEarnings(earnings,requirementsInfoId);
+        BigDecimal orderEarnings = requirementsInfoDO.getOrderEarnings();
+        BigDecimal add = orderEarnings.add(earnings);
+        requirementsDao.updateOrderEarnings(add,requirementsInfoId);
         requirementsDao.updateInfo(requirementsInfoId, 5);
         requirementsDao.updateScene(requirementsInfoId, 5);
         return ResultBody.success();

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -94,7 +94,8 @@
 
     <select id="findUpdateAmount" resultType="com.mmc.csf.release.entity.requirements.RequirementsAmountUpdateDO">
         select requirements_info_id,order_amount,update_order_amount,return_cash_amount,return_we_chat,return_salary_amount,
-               cash_amount,cash_amount,we_chat,salary_amount,wechat_pay_order_number from requirements_info_id=#{requirementsInfoId}
+               cash_amount,cash_amount,we_chat,salary_amount,wechat_pay_order_number from
+          requirements_amount_update where  requirements_info_id=#{requirementsInfoId}
     </select>
 
     <insert id="insertPlatformOrderEarnings">
@@ -729,7 +730,8 @@
     </select>
 
     <select id="myPreempt" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
-        SELECT ri.id,
+        SELECT
+        ri.id,
         ri.task_title,
         ri.task_start_time,
         ri.task_end_time,
@@ -754,11 +756,14 @@
         ri.publish,
         rs.preempt_total_amount,
         ra.order_level,
-        ra.order_amount
-        FROM requirements_info ri
+        ra.order_amount,
+        rau.update_order_amount
+        FROM
+        requirements_info ri
         LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
         LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
-        left join requirements_amount ra on ra.requirements_info_id = ri.id
+        LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
+        LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
         INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
         WHERE rs.pilot_certification_user_id = #{userAccountId} AND rs.is_deleted !=1
         <if test=" requirementsInfoId != null  ">
@@ -955,6 +960,56 @@
     </select>
 
 
+    <select id="publisherCancelFlyers" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
+        SELECT ri.id,
+               ri.task_title,
+               ri.task_start_time,
+               ri.task_end_time,
+               ri.task_address,
+               ri.longitude,
+               ri.latitude,
+               ri.require_url,
+               ri.require_description,
+               ri.requirement_type_id,
+               ri.user_account_id,
+               rt.type_name AS requirementTypeName,
+               ri.publish_phone,
+               ri.publisher_number,
+               ri.service_id,
+               ra.total_amount,
+               ri.insurance,
+               ra.order_level,
+               ra.order_amount,
+               sf.doing,
+               sf.waiting,
+               sf.user_port,
+               sf.flyer_port,
+               sf.order_status,
+               ri.publish,
+               ra.order_amount,
+               ra.we_chat,
+               ra.salary_amount,
+               ra.cash_amount,
+               ra.level_cash_amount,
+               ra.level_salary_amount,
+               ra.level_we_chat_amount,
+               ra.wechat_pay_order_number,
+               ri.service_flow_id,
+               rs.pilot_certification_user_id,
+               rs.openid    as flyerOpenid,
+               ri.create_time,
+               ra.order_level_amount,
+               ra.order_earnings
+        FROM requirements_info ri
+                 LEFT JOIN requirements_type rt
+                           ON rt.id = ri.requirement_type_id
+                 LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
+                 LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
+                 LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
+        WHERE  ri.id = #{requirementsInfoId}
+    </select>
+
+
     <select id="customerPublisherCancel" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
         SELECT ri.id,
                ri.task_title,