中台审核更改状态

alien-entity/src/main/java/shop/alien/mapper/LifeUserExpertOrderMapper.java

@@ -11,6 +11,7 @@ import shop.alien.entity.store.LifeUserExpertOrder;
 import shop.alien.entity.store.vo.LifeUserExpertOrderVo;
 import shop.alien.entity.store.vo.LifeUserExpertVo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -177,5 +178,10 @@ public interface LifeUserExpertOrderMapper extends BaseMapper<LifeUserExpertOrde
     LifeUserExpertOrderVo getDataDetails(@Param("id") Integer id);
 
 
+    @Update("UPDATE " +
+            "life_user_expert_order " +
+            "SET account_money = account_money + #{money}" +
+            "WHERE id = #{id} AND delete_flag = 0")
+    void addAccountMoneyById(@Param("id") Integer id, @Param("amount") BigDecimal money);
 
 }

alien-store/src/main/java/shop/alien/store/controller/LifeUserExpertController.java

@@ -172,7 +172,7 @@ public class LifeUserExpertController {
                         @ApiImplicitParam(name = "orderNo", value = "订单号", dataType = "String", paramType = "query"),
                         @ApiImplicitParam(name = "orderMoney", value = "订单金额", dataType = "String", paramType = "query"),
                         @ApiImplicitParam(name = "advancePaymentStatus", value = "预付款审核状态", dataType = "String", paramType = "query"),
-                        @ApiImplicitParam(name = "advance", value = "预付款", dataType = "BigDecimal", paramType = "query"),
+                        @ApiImplicitParam(name = "advance", value = "预付款金额", dataType = "BigDecimal", paramType = "query"),
     })
     @GetMapping("/getAdvancePaymentReview")
     public R <Map<String,String>> getAdvancePaymentReview(Integer id, String reasonRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String advancePaymentStatus , BigDecimal advance) {
@@ -215,12 +215,13 @@ public class LifeUserExpertController {
             @ApiImplicitParam(name = "storeTel", value = "门店电话", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "orderNo", value = "订单号", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "orderMoney", value = "订单金额", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endFundsButton", value = "申请尾款状态", dataType = "String", paramType = "query", required = true)
+            @ApiImplicitParam(name = "endFundsButton", value = "申请尾款状态", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "endPayment", value = "尾款金额", dataType = "BigDecimal", paramType = "query"),
     })
     @GetMapping("/getFinalPaymentReview")
-    public R <Map<String,String>> getFinalPaymentReview(Integer id, String endPaymentRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String endFundsButton) {
-        log.info("LifeUserExpertController.getViewDetails?Id={},endPaymentRefusal{},userPhone{},name{},orderNo{},orderMoney{},endFundsButton{}",id,endPaymentRefusal,userPhone,name,orderNo,orderMoney,endFundsButton);
-        return R.data(lifeUserExpertService.getFinalPaymentReview(id, endPaymentRefusal, userPhone, name,storeTel,orderNo,orderMoney,endFundsButton));
+    public R <Map<String,String>> getFinalPaymentReview(Integer id, String endPaymentRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String endFundsButton , BigDecimal endPayment) {
+        log.info("LifeUserExpertController.getViewDetails?Id={},endPaymentRefusal{},userPhone{},name{},orderNo{},orderMoney{},endFundsButton{},endPayment{}",id,endPaymentRefusal,userPhone,name,orderNo,orderMoney,endFundsButton ,endPayment);
+        return R.data(lifeUserExpertService.getFinalPaymentReview(id, endPaymentRefusal, userPhone, name,storeTel,orderNo,orderMoney,endFundsButton,endPayment));
     }
 
 

alien-store/src/main/java/shop/alien/store/service/LifeUserExpertService.java

@@ -55,7 +55,7 @@ public interface LifeUserExpertService extends IService<LifeUserExpert> {
 
     IPage<LifeUserExpertOrderVo> getFinalPaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime,String endPayTime,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId);
 
-    Map<String,String> getFinalPaymentReview(Integer id, String endPaymentRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String endFundsButton);
+    Map<String,String> getFinalPaymentReview(Integer id, String endPaymentRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String endFundsButton ,BigDecimal endPayment);
 
     IPage<LifeUserExpertOrderVo> getOrderList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime, String endPayTime,String name, Integer userId);
 

alien-store/src/main/java/shop/alien/store/service/impl/LifeUserExpertServiceImpl.java

@@ -471,6 +471,9 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
             lifeUserExpertOrder.setReasonRefusal(reasonRefusal);
             lifeUserExpertOrder.setFirstPaymentTime(new Date());
             int i=lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
+            //更新达人订单表中的到账金额数值
+            lifeUserExpertOrderMapper.addAccountMoneyById(id, advance);
+
             String text = "您的"+name+"已被商家订购，可在应用内我的-我的钱包中查看预付款金额。";
             String title = "发放预付款通知";
             String  phone = "user_"+userPhone;
@@ -490,19 +493,20 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
             String title = "订单退款通知";
             String  phone = "store_"+storeTel;
             sendMessage(advancePaymentStatu,phone ,text,title);
-
+            lifeUserExpertOrder.setId(id);
+            lifeUserExpertOrder.setAdvancePaymentStatus(advancePaymentStatus);
+            lifeUserExpertOrder.setAdvancePaymentTime(new Date());
+            lifeUserExpertOrder.setReasonRefusal(reasonRefusal);
+            lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
             //退款逻辑
             String partialRefundCode = "";
             String result=aliApi.processRefund(orderNo, orderMoney, reasonRefusal, partialRefundCode);
             //支付宝退款成功，发送系统消息，更新订单表审核状态
             if ("调用成功".equals(result)){
                 lifeUserExpertOrder.setId(id);
-                lifeUserExpertOrder.setAdvancePaymentStatus(advancePaymentStatus);
-                lifeUserExpertOrder.setAdvancePaymentTime(new Date());
-                lifeUserExpertOrder.setReasonRefusal(reasonRefusal);
                 lifeUserExpertOrder.setRefundTime(new Date());
                 lifeUserExpertOrder.setStatus(6);
-                int i=lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
+                lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
                 String text1 = "您订购的达人推广套餐-"+name+"，订单金额："+orderMoney+"元，已经成功发放到您的支付宝账户，请注意查收。";
                 String title1 = "退款到账成功通知";
                 sendMessage(advancePaymentStatu,userPhone ,text1,title1);
@@ -578,7 +582,7 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
     }
 
     @Override
-    public Map<String,String> getFinalPaymentReview(Integer id, String endPaymentRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String endFundsButton) {
+    public Map<String,String> getFinalPaymentReview(Integer id, String endPaymentRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String endFundsButton ,BigDecimal endPayment) {
         Map<String,String> map = new HashMap<>();
         LifeUserExpertOrder lifeUserExpertOrder =new LifeUserExpertOrder() ;
         lifeUserExpertOrder.setId(id);
@@ -591,6 +595,10 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
             lifeUserExpertOrder.setFinalPaymentTime(new Date());
             lifeUserExpertOrder.setStatus(2);
             int i=lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
+
+            //更新达人订单表中的到账金额数值
+            lifeUserExpertOrderMapper.addAccountMoneyById(id, endPayment);
+
             String text = "您在"+new Date()+"提交的申请尾款信息，已通过审核。尾款可在应用内我的-我的钱包中查看。";
             String title = "尾款审核通过通知";
             String  phone = "user_"+userPhone;