修改达人部分细节

alien-entity/src/main/java/shop/alien/entity/store/LifeUserExpertOrder.java

@@ -158,4 +158,8 @@ public class LifeUserExpertOrder extends Model<LifeUserExpertOrder> {
     @ApiModelProperty(value = "取消时间 ")
     @TableField(value = "cancel_time")
     private Date cancelTime;
+
+    @ApiModelProperty(value = "佣金金额 ")
+    @TableField(value = "commission_money")
+    private BigDecimal commissionMoney;
 }

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

@@ -41,7 +41,7 @@ public interface LifeUserExpertOrderMapper extends BaseMapper<LifeUserExpertOrde
 
 
     @Select("select SUM(lueo.account_money) AS accountMoney, " +
-            "SUM(COALESCE(lueo.order_money, 0)) - SUM(COALESCE(lueo.account_money, 0)) AS pendingPerformanceIncome, " +
+            "SUM(COALESCE(lueo.order_money, 0)) - SUM(COALESCE(lueo.commission_money, 0)) - SUM(COALESCE(lueo.account_money, 0)) AS pendingPerformanceIncome,  " +
             "SUM(CASE WHEN lueo.STATUS = 5 THEN 1 ELSE 0 END) AS completedOrdersNumber, " +
             "SUM(CASE WHEN (lueo.STATUS = 3 or lueo.STATUS = 4) THEN 1 ELSE 0 END) AS incompleteOrdersNumber " +
             "FROM life_user_expert_order lueo " +
@@ -180,8 +180,16 @@ public interface LifeUserExpertOrderMapper extends BaseMapper<LifeUserExpertOrde
 
     @Update("UPDATE " +
             "life_user_expert_order " +
-            "SET account_money = account_money + #{money}" +
+            "SET account_money = account_money + #{advance} ," +
+            "commission_money = #{commissionMoney}" +
             "WHERE id = #{id} AND delete_flag = 0")
-    void addAccountMoneyById(@Param("id") Integer id, @Param("amount") BigDecimal money);
+    void addAccountMoneyById(@Param("id") Integer id, @Param("advance") BigDecimal advance , @Param("commissionMoney") BigDecimal commissionMoney);
+
+
+    @Update("UPDATE " +
+            "life_user_expert_order " +
+            "SET account_money = account_money + #{endPayment}" +
+            "WHERE id = #{id} AND delete_flag = 0")
+    void updateAccountMoneyById(@Param("id") Integer id, @Param("endPayment") BigDecimal endPayment);
 
 }

alien-entity/src/main/resources/mapper/LifeUserExpertOrderMapper.xml

@@ -37,12 +37,13 @@
         <result column="commission_rate" property="commissionRate" />
         <result column="advance_rate" property="advanceRate" />
         <result column="cancel_time" property="cancelTime" />
+        <result column="commission_money" property="commissionMoney" />
 
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, order_id, expert_id, package_id , store_id, order_money, account_money, order_time, complete_time, first_payment_time, final_payment_time, order_play_count, order_gmv, actual_gmv, status, delete_flag, created_time, created_user_id, updated_time, updated_user_id, advance_payment_status, end_funds_button ,reason_refusal,advancePaymentTime,endFundsTime,endPaymentTime,endPaymentRefusal,payTime,refundTime,commission_rate,advance_rate,cancel_time
+        id, order_id, expert_id, package_id , store_id, order_money, account_money, order_time, complete_time, first_payment_time, final_payment_time, order_play_count, order_gmv, actual_gmv, status, delete_flag, created_time, created_user_id, updated_time, updated_user_id, advance_payment_status, end_funds_button ,reason_refusal,advancePaymentTime,endFundsTime,endPaymentTime,endPaymentRefusal,payTime,refundTime,commission_rate,advance_rate,cancel_time ,commission_money
     </sql>
 
 </mapper>

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

@@ -172,12 +172,13 @@ 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 = "commissionMoney", 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) {
-        log.info("LifeUserExpertController.getViewDetails?Id={},reasonRefusal{},userPhone{},name{},orderNo{},orderMoney{},advancePaymentStatus{},advance{}",id,reasonRefusal,userPhone,name,orderNo,orderMoney,advancePaymentStatus, advance);
-        return R.data(lifeUserExpertService.getAdvancePaymentReview(id, reasonRefusal, userPhone, name,storeTel,orderNo,orderMoney,advancePaymentStatus,advance));
+    public R <Map<String,String>> getAdvancePaymentReview(Integer id, String reasonRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String advancePaymentStatus , BigDecimal commissionMoney,BigDecimal advance) {
+        log.info("LifeUserExpertController.getViewDetails?Id={},reasonRefusal{},userPhone{},name{},orderNo{},orderMoney{},advancePaymentStatus{},commissionMoney{},advance{}",id,reasonRefusal,userPhone,name,orderNo,orderMoney,advancePaymentStatus, commissionMoney,advance);
+        return R.data(lifeUserExpertService.getAdvancePaymentReview(id, reasonRefusal, userPhone, name,storeTel,orderNo,orderMoney,advancePaymentStatus,commissionMoney,advance));
     }
 
     @ApiOperation("达人尾款列表")

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

@@ -51,7 +51,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 firstPayTime, String endPayTime,String name, Integer userId);
 
-    Map<String,String> getAdvancePaymentReview(Integer id, String reasonRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String advancePaymentStatus, BigDecimal advance);
+    Map<String,String> getAdvancePaymentReview(Integer id, String reasonRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String advancePaymentStatus,BigDecimal commissionMoney, BigDecimal advance);
 
     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);
 

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

@@ -80,7 +80,7 @@ public class LifeUserExpertOrderServiceImpl extends ServiceImpl<LifeUserExpertOr
         resultMap.put("orderPlayCount", lifeUserExpertOrderVos.getOrderPlayCount());
         resultMap.put("orderGmv", lifeUserExpertOrderVos.getOrderGmv());
         resultMap.put("actualPlayCount", lifeUserExpertOrderVos.getActualPlayCount());
-        resultMap.put("statusName", lifeUserExpertOrderVos.getStatusName());
+        resultMap.put("status", lifeUserExpertOrderVos.getStatusName());
         resultMap.put("actualGmv", lifeUserExpertOrderVos.getActualGmv());
         resultMap.put("completedOrdersNumber", lifeUserExpertOrderVos.getCompletedOrdersNumber());
         resultMap.put("storeVisitViewCount", lifeUserExpertOrderVos.getStoreVisitViewCount());

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

@@ -383,7 +383,6 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
         if (createdTime != null && !createdTime.isEmpty()){
             wrapper.gt("expert.created_time", createdTime);
         }
-//        wrapper.gt(createdTime != null, "expert.created_time", createdTime);
 //        //查询在createdTime之前数据
         if (endTime != null && !endTime.isEmpty()) {
             wrapper.lt("expert.created_time", endTime);
@@ -440,6 +439,8 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
         if (endPayTime != null && !endPayTime.isEmpty()) {
             wrapper.lt("ccc.pay_time", endPayTime);
         }
+        //根据最后修改时间进行排序
+        wrapper.orderByDesc("ccc.updated_time");
         List<LifeUserExpertOrderVo> list=lifeUserExpertOrderMapper.getAdvancePaymentList(wrapper);
 
         for (LifeUserExpertOrderVo lifeUserExpertOrderVo : list) {
@@ -458,7 +459,7 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
     }
 
     @Override
-    public Map<String,String> getAdvancePaymentReview(Integer id,String reasonRefusal,String userPhone, String name,String storeTel,String orderNo, String orderMoney,String advancePaymentStatus,BigDecimal advance) {
+    public Map<String,String> getAdvancePaymentReview(Integer id,String reasonRefusal,String userPhone, String name,String storeTel,String orderNo, String orderMoney,String advancePaymentStatus, BigDecimal commissionMoney,BigDecimal advance) {
 
         Map<String,String> map = new HashMap<>();
         Integer advancePaymentStatu= Integer.valueOf(advancePaymentStatus);
@@ -468,11 +469,12 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
             lifeUserExpertOrder.setId(id);
             lifeUserExpertOrder.setAdvancePaymentStatus(advancePaymentStatus);
             lifeUserExpertOrder.setAdvancePaymentTime(new Date());
+            lifeUserExpertOrder.setUpdatedTime(new Date());
             lifeUserExpertOrder.setReasonRefusal(reasonRefusal);
             lifeUserExpertOrder.setFirstPaymentTime(new Date());
             int i=lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
             //更新达人订单表中的到账金额数值
-            lifeUserExpertOrderMapper.addAccountMoneyById(id, advance);
+            lifeUserExpertOrderMapper.addAccountMoneyById(id, advance, commissionMoney);
 
             String text = "您的"+name+"已被商家订购，可在应用内我的-我的钱包中查看预付款金额。";
             String title = "发放预付款通知";
@@ -511,6 +513,8 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
                 String title1 = "退款到账成功通知";
                 sendMessage(advancePaymentStatu,userPhone ,text1,title1);
             }else{
+                lifeUserExpertOrder.setAdvancePaymentStatus("1");
+                lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
                 //当status=1，审核失败，codemsg=代表支付宝返回的错误信息
                 map.put("codeMsg",result);
                 map.put("status","1");
@@ -598,7 +602,7 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
             int i=lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
 
             //更新达人订单表中的到账金额数值
-            lifeUserExpertOrderMapper.addAccountMoneyById(id, endPayment);
+            lifeUserExpertOrderMapper.updateAccountMoneyById(id, endPayment);
 
             String text = "您在"+formattedDate+"提交的申请尾款信息，已通过审核。尾款可在应用内我的-我的钱包中查看。";
             String title = "尾款审核通过通知";