中台达人尾款代码

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

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

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

@@ -50,7 +50,7 @@ public interface LifeUserExpertService extends IService<LifeUserExpert> {
 
     IPage<LifeUserExpertOrderVo> getAdvancePaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String name, Integer userId);
 
-    Boolean getAdvancePaymentReview(Integer id,String reasonRefusal, String userPhone,String name,String storeTel,String orderNo, String orderMoney,String advancePaymentStatus);
+    Map<String,String> getAdvancePaymentReview(Integer id,String reasonRefusal, String userPhone,String name,String storeTel,String orderNo, String orderMoney,String advancePaymentStatus);
 
     IPage<LifeUserExpertOrderVo> getFinalPaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId);
 

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

@@ -450,9 +450,9 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
     }
 
     @Override
-    public Boolean getAdvancePaymentReview(Integer id,String reasonRefusal,String userPhone, String name,String storeTel,String orderNo, String orderMoney,String advancePaymentStatus) {
-
+    public Map<String,String> getAdvancePaymentReview(Integer id,String reasonRefusal,String userPhone, String name,String storeTel,String orderNo, String orderMoney,String advancePaymentStatus) {
 
+        Map<String,String> map = new HashMap<>();
         Integer advancePaymentStatu= Integer.valueOf(advancePaymentStatus);
         LifeUserExpertOrder lifeUserExpertOrder =new LifeUserExpertOrder() ;
         if ("0".equals(advancePaymentStatus)){
@@ -467,6 +467,9 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
             String title = "发放预付款通知";
             String  phone = "user_"+userPhone;
             sendMessage(advancePaymentStatu,phone ,text,title);
+            map.put("codeMsg","审核成功");
+            map.put("status","0");
+            return map;
         } else if ("2".equals(advancePaymentStatus)){
             String text = "您订购的达人推广套餐-"+name+"，审核未通过，拒绝原因："+reasonRefusal+"，平台会在1-3个工作日将全部款项发放到你的支付宝账户，请注意查收。如未到账，请联系客服处理。";
             String title = "订单退款通知";
@@ -486,10 +489,14 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
                 String text1 = "您订购的达人推广套餐-"+name+"，订单金额："+orderMoney+"元，已经成功发放到您的支付宝账户，请注意查收。";
                 String title1 = "退款到账成功通知";
                 sendMessage(advancePaymentStatu,userPhone ,text1,title1);
+            }else{
+                //当status=1，审核失败，codemsg=代表支付宝返回的错误信息
+                map.put("codeMsg",result);
+                map.put("status","1");
+                return map;
             }
         }
-
-        return false;
+        return map;
     }
 
     @Override
@@ -559,12 +566,14 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
         Integer endFundsButtons = Integer.valueOf(endFundsButton);
         if ("2".equals(endFundsButton)){
             lifeUserExpertOrder.setFinalPaymentTime(new Date());
+            lifeUserExpertOrder.setStatus(2);
             int i=lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
             String text = "您在"+new Date()+"提交的申请尾款信息，已通过审核。尾款可在应用内我的-我的钱包中查看。";
             String title = "尾款审核通过通知";
             String  phone = "user_"+userPhone;
             sendMessage(endFundsButtons,phone ,text,title);
-            map.put("status","审核成功,发送系统消息成功");
+            map.put("codeMsg","审核成功");
+            map.put("status","0");
             return map;
         } else if ("3".equals(endFundsButton)){
             lifeUserExpertOrder.setEndPaymentRefusal(endPaymentRefusal);
@@ -573,7 +582,8 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
             String title = "尾款审核失败通知";
             String  phone = "user_"+userPhone;
             sendMessage(endFundsButtons,phone ,text,title);
-            map.put("status","审核驳回,发送系统消息成功");
+            map.put("codeMsg","审核驳回");
+            map.put("status","1");
             return map;
         }
         return map;

alien-store/src/main/java/shop/alien/store/util/ali/AliApi.java

@@ -202,7 +202,8 @@ public class AliApi {
 
             } else {
                 log.warn("AliPayConfig.processRefund ERROR Msg={}", response.getBody());
-                refundReslut = "调用失败";
+                JSONObject jsonObject = JSONObject.parseObject(response.getBody()).getJSONObject("alipay_trade_refund_response");
+                refundReslut =  jsonObject.getString("sub_msg");
             }
             return refundReslut;
         } catch (AlipayApiException e) {