Pārlūkot izejas kodu

中台达人预付款代码

ldz 1 mēnesi atpakaļ
vecāks
revīzija
01d13b8248

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

@@ -111,7 +111,7 @@ public class LifeUserExpertOrder extends Model<LifeUserExpertOrder> {
     @TableField(value = "updated_user_id", fill = FieldFill.INSERT_UPDATE)
     private Integer updatedUserId;
 
-    @ApiModelProperty(value = "预付款审核")
+    @ApiModelProperty(value = "预付款审核状态 预付款审核  0审核通过  1待审核  2审核拒绝")
     @TableField(value = "advance_payment_status")
     private String advancePaymentStatus;
 

+ 6 - 3
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertOrderVo.java

@@ -93,14 +93,17 @@ public class LifeUserExpertOrderVo extends LifeUserExpertOrder {
 
     @ApiModelProperty(value = "预付款比例")
     @TableField(value = "advance_rate")
-    private String advanceRate;
+    private Integer advanceRate;
 
     @ApiModelProperty(value = "佣金比例")
     @TableField(value = "commission_rate")
-    private String commissionRate;
+    private Integer commissionRate;
 
-    @ApiModelProperty(value = "预付款审核状态  0审核通过  1审核  2审核拒绝")
+    @ApiModelProperty(value = "预付款审核状态  0审核通过  1审核  2审核拒绝")
     @TableField(value = "advance_payment_status")
     private String advancePaymentStatus;
 
+    @ApiModelProperty(value = "身份证号")
+    private String idCard;
+
 }

+ 6 - 0
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertVo.java

@@ -117,5 +117,11 @@ public class LifeUserExpertVo extends LifeUserExpert {
     @ApiModelProperty(value = "审核时间")
     private Date reviewTime;
 
+    @ApiModelProperty(value = "佣金比例 ")
+    private Integer commissionRate;
+
+    @ApiModelProperty(value = "预付款比例 ")
+    private Integer advanceRate;
+
 
 }

+ 2 - 2
alien-entity/src/main/java/shop/alien/mapper/LifeUserExpertMapper.java

@@ -155,8 +155,8 @@ public interface LifeUserExpertMapper extends BaseMapper<LifeUserExpert> {
     List<LifeUserExpertVo> getFanPortrait(Integer expertId);
 
     @Select("select expert.id, expert.expert_code, " +
-            "expert.delete_flag, expert.created_time, expert.expert_status,expert.created_user_id, expert.updated_time, expert.updated_user_id," +
-            "user.user_name, user.province, user.city, user.district, user.user_brithday, user.user_sex " +
+            "expert.delete_flag, expert.created_time, expert.expert_status,expert.created_user_id, expert.updated_time, expert.updated_user_id,expert.commission_rate,expert.advance_rate," +
+            "user_name, user.province, user.city, user.district, user.user_brithday, user.user_sex " +
             " from life_user_expert expert " +
             " left join life_user user on user.id = expert.user_id " +
             " left join life_fans fans on fans.followed_id = concat('user_', user.user_phone)  " +

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

@@ -47,7 +47,7 @@ public interface LifeUserExpertOrderMapper extends BaseMapper<LifeUserExpertOrde
     List<LifeUserExpertOrderVo> getExpertOrderDetails(@Param("expertId") Long expertId);
 
 
-    @Select("select orders.id, orders.order_no, store.store_name, orders.order_money, package.name,orders.account_money,orders.first_funds_button,orders.end_funds_button, if (orders.status = '1', '待完成', '已完成') statusName, " +
+    @Select("select orders.id, orders.order_no, store.store_name, orders.order_money, package.name,orders.account_money,orders.end_funds_button, if (orders.status = '1', '待完成', '已完成') statusName, " +
             "       orders.order_time, orders.complete_time  " +
             "from life_user_expert_order orders " +
             "left join store_info store on store.id = orders.store_id " +
@@ -104,7 +104,7 @@ public interface LifeUserExpertOrderMapper extends BaseMapper<LifeUserExpertOrde
 
 
 
-    @Select("SELECT ccc.* ,info.store_name,user.real_name,user.user_phone,package.name " +
+    @Select("SELECT ccc.* ,info.store_name,user.real_name,expert.promote_type,expert.advance_rate,expert.commission_rate,user.user_phone,user.id_card,package.name " +
             "FROM life_user_expert_order ccc " +
             "LEFT JOIN store_info info on info.id = ccc.store_id " +
             "left join life_user_expert expert on expert.id = ccc.expert_id " +

+ 13 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeUserExpertController.java

@@ -149,14 +149,25 @@ public class LifeUserExpertController {
             @ApiImplicitParam(name = "orderNo", value = "订单编号", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "storeName", value = "商家昵称", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "userId", value = "用户id", dataType = "String", paramType = "query")
-
     })
     @GetMapping("/getAdvancePaymentList")
-    public R<List<LifeUserExpertOrderVo>> getAdvancePaymentList( Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String name, Integer userId) {
+    public R<IPage<LifeUserExpertOrderVo>> getAdvancePaymentList( Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String name, Integer userId) {
         log.info("LifeUserExpertController.getViewDetails?userId={}",userId);
         return R.data(lifeUserExpertService.getAdvancePaymentList(page, size, realName, userPhone, advancePaymentStatus, orderCreatedTime, orderEndTime, name, userId));
     }
 
 
+    @ApiOperation("预付款审核接口")
+    @ApiOperationSupport(order = 12)
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "达人订单表id", dataType = "Integer", paramType = "query",required = true),
+                        @ApiImplicitParam(name = "reasonRefusal", value = "拒绝原因", dataType = "String", paramType = "query"),
+                        @ApiImplicitParam(name = "advancePaymentStatus", value = "预付款审核状态", dataType = "String", paramType = "query")
+    })
+    @GetMapping("/getAdvancePaymentReview")
+    public R <Boolean> getAdvancePaymentReview( Integer id,String reasonRefusal, String advancePaymentStatus) {
+        log.info("LifeUserExpertController.getViewDetails?Id={},reasonRefusal{},advancePaymentStatus{}",id,reasonRefusal,advancePaymentStatus);
+        return R.data(lifeUserExpertService.getAdvancePaymentReview(id, reasonRefusal, advancePaymentStatus));
+    }
+
 
 }

+ 3 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserExpertService.java

@@ -46,5 +46,7 @@ public interface LifeUserExpertService extends IService<LifeUserExpert> {
 
     LifeUserExpertVo getViewDetails(Integer expertId);
 
-    List<LifeUserExpertOrderVo> getAdvancePaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String name, Integer userId);
+    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 advancePaymentStatus);
 }

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

@@ -394,7 +394,7 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
     }
 
     @Override
-    public List<LifeUserExpertOrderVo> getAdvancePaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String name, Integer userId) {
+    public IPage<LifeUserExpertOrderVo> getAdvancePaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String name, Integer userId) {
         QueryWrapper<LifeUserExpertVo> wrapper = new QueryWrapper<>();
         wrapper.eq("ccc.delete_flag", 0);
         wrapper.eq("user.delete_flag", 0);
@@ -412,7 +412,33 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
         if (orderEndTime != null && !orderEndTime.isEmpty()) {
             wrapper.lt("ccc.order_time", orderEndTime);
         }
-        return lifeUserExpertOrderMapper.getAdvancePaymentList(wrapper);
+        List<LifeUserExpertOrderVo> list=lifeUserExpertOrderMapper.getAdvancePaymentList(wrapper);
+
+        for (LifeUserExpertOrderVo lifeUserExpertOrderVo : list) {
+            int advanceRate = lifeUserExpertOrderVo.getAdvanceRate();
+            int commissionRate = lifeUserExpertOrderVo.getCommissionRate();
+            BigDecimal advanceAmount = lifeUserExpertOrderVo.getOrderMoney().multiply(BigDecimal.valueOf(advanceRate))
+                    .divide(new BigDecimal(100));
+            BigDecimal commissionAmount = lifeUserExpertOrderVo.getOrderMoney().multiply(BigDecimal.valueOf(commissionRate))
+                    .divide(new BigDecimal(100));
+            lifeUserExpertOrderVo.setAdvance(advanceAmount.toString());
+            lifeUserExpertOrderVo.setCommission(commissionAmount.toString());
+        }
+        return ListToPage.setPage(list,page, size);
+    }
+
+    @Override
+    public Boolean getAdvancePaymentReview(Integer id,String reasonRefusal, String advancePaymentStatus) {
+        LifeUserExpertOrder lifeUserExpertOrder =new LifeUserExpertOrder() ;
+        lifeUserExpertOrder.setId(id);
+        lifeUserExpertOrder.setAdvancePaymentStatus(advancePaymentStatus);
+        lifeUserExpertOrder.setUpdatedTime(new Date());
+        lifeUserExpertOrder.setReasonRefusal(reasonRefusal);
+        int i=lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
+        if (i>0){
+            return true;
+        }
+        return false;
     }
 
 }