中台达人预付款部分代码

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

@@ -78,9 +78,6 @@ public class ExpertImg extends Model<ExpertImg> {
     private Date updatedTime;
 
 
-    @ApiModelProperty(value = "推广类型")
-    @TableField(value = "promote_type")
-    private String promoteType;
 
 
 

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

@@ -90,6 +90,10 @@ public class LifeUserExpert extends Model<LifeUserExpert> {
     @TableField(value = "advance_rate")
     private Integer advanceRate;
 
+    @ApiModelProperty(value = "推广类型 ")
+    @TableField(value = "promote_type")
+    private String promoteType;
+
 
 
 }

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

@@ -111,12 +111,16 @@ public class LifeUserExpertOrder extends Model<LifeUserExpertOrder> {
     @TableField(value = "updated_user_id", fill = FieldFill.INSERT_UPDATE)
     private Integer updatedUserId;
 
-    @ApiModelProperty(value = "申请首款按钮")
-    @TableField(value = "first_funds_button")
-    private String firstFundsButton;
+    @ApiModelProperty(value = "预付款审核")
+    @TableField(value = "advance_payment_status")
+    private String advancePaymentStatus;
 
     @ApiModelProperty(value = "申请尾款按钮")
     @TableField(value = "end_funds_button")
     private String endFundsButton;
 
+    @ApiModelProperty(value = "预付款审核拒绝原因")
+    @TableField(value = "reason_refusal")
+    private String reasonRefusal;
+
 }

alien-entity/src/main/java/shop/alien/entity/store/vo/ExpertImgVo.java

@@ -0,0 +1,64 @@
+package shop.alien.entity.store.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import shop.alien.entity.store.LifeUserExpertOrder;
+
+import java.util.Date;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ExpertImgVo", description="达人申请图片vo")
+public class ExpertImgVo extends LifeUserExpertOrder {
+
+    @ApiModelProperty(value = "主键id")
+    private Integer id;
+
+    @ApiModelProperty(value = "达人id")
+    private Integer expertId;
+
+    @ApiModelProperty(value = "达人码")
+    private Integer expertCode;
+
+    @ApiModelProperty(value = "用户id（life_user表id）")
+    private Integer userId;
+
+
+    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
+    private Integer deleteFlag;
+
+
+    @ApiModelProperty(value = "图片类型 0 申请成为达人上传的图片")
+    private Integer imgType;
+
+    @ApiModelProperty(value = "图片描述")
+    private String imgDescription;
+
+    @ApiModelProperty(value = "图片排序")
+    private Integer imgSort;
+
+    @ApiModelProperty(value = "图片路径")
+    private String imgUrl;
+
+    @ApiModelProperty(value = "补充说明")
+    private String addExplanation;
+
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createdTime;
+
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updatedTime;
+
+    @ApiModelProperty(value = "推广类型")
+    private String promoteType;
+
+
+}

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

@@ -44,6 +44,9 @@ public class LifeUserExpertOrderVo extends LifeUserExpertOrder {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date earliestCreatedTime;
 
+    @ApiModelProperty(value = "订单金额")
+    private BigDecimal orderMoney;
+
     @ApiModelProperty(value = "到账总金额")
     private BigDecimal accountMoney;
 
@@ -62,12 +65,6 @@ public class LifeUserExpertOrderVo extends LifeUserExpertOrder {
     @ApiModelProperty(value = "套餐名称")
     private String name;
 
-//    @ApiModelProperty(value = "申请首款按钮状态")
-//    private String firstFundsButton;
-//
-//    @ApiModelProperty(value = "申请尾款按钮状态")
-//    private String endFundsButton;
-
     @ApiModelProperty(value = "申请首款按钮")
     @TableField(value = "first_funds_button")
     private String firstFundsButton;
@@ -76,4 +73,34 @@ public class LifeUserExpertOrderVo extends LifeUserExpertOrder {
     @TableField(value = "end_funds_button")
     private String endFundsButton;
 
+    @ApiModelProperty(value = "推广类型")
+    @TableField(value = "promote_type")
+    private String promoteType;
+
+    @ApiModelProperty(value = "用户真实姓名")
+    @TableField(value = "real_name")
+    private String realName;
+
+    @ApiModelProperty(value = "用户手机号")
+    @TableField(value = "user_phone")
+    private String userPhone;
+
+    @ApiModelProperty(value = "佣金")
+    private String commission;
+
+    @ApiModelProperty(value = "预付款")
+    private String advance;
+
+    @ApiModelProperty(value = "预付款比例")
+    @TableField(value = "advance_rate")
+    private String advanceRate;
+
+    @ApiModelProperty(value = "佣金比例")
+    @TableField(value = "commission_rate")
+    private String commissionRate;
+
+    @ApiModelProperty(value = "预付款审核状态  0审核通过  1未审核  2审核拒绝")
+    @TableField(value = "advance_payment_status")
+    private String advancePaymentStatus;
+
 }

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

@@ -198,10 +198,9 @@ public interface LifeUserExpertMapper extends BaseMapper<LifeUserExpert> {
     Boolean updateExpert(LifeUserExpert lifeUserExpert);
 
     @Select(
-            "select   expert.* ,img.promote_type,user.* "+
+            "select   expert.*,user.* "+
                     "from life_user_expert expert " +
                     "join life_user user on user.id = expert.user_id " +
-                    "left join expert_img img on img.user_id = expert.user_id " +
                     "${ew.customSqlSegment}")
     List<LifeUserExpertVo> getApplicationExpertList(@Param(Constants.WRAPPER) QueryWrapper<LifeUserExpertVo> wrapper);
 

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

@@ -103,13 +103,14 @@ public interface LifeUserExpertOrderMapper extends BaseMapper<LifeUserExpertOrde
     void updateButton(@Param("firstButton") String firstButton,@Param("endButton") String endButton,@Param("orderNo") String orderNo);
 
 
-    @Select(
-            "select   order.* ,info.info_name,user.real_name,user.user_phone,img.promote_type, "+
-                    "from life_user_expert_order order " +
-                    "left join store_info info on info.id = order.store_id " +
-                    "left join life_user_expert expert on expert.id = order.expert_id " +
-                    "left join life_user user on user.id = expert.user_id " +
-                    "left join expert_img img on img.user_id = expert.user_id " +
-                    "${ew.customSqlSegment}")
+
+    @Select("SELECT ccc.* ,info.store_name,user.real_name,user.user_phone,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 " +
+            "left join life_user user on user.id = expert.user_id " +
+            "left join life_promotion_package package on package.id = ccc.package_id " +
+            " ${ew.customSqlSegment}")
+
     List<LifeUserExpertOrderVo> getAdvancePaymentList(@Param(Constants.WRAPPER) QueryWrapper<LifeUserExpertVo> wrapper);
 }

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

@@ -16,13 +16,12 @@
         <result column="add_explanation" property="addExplanation" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
-        <result column="promote_type" property="promoteType" />
 
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, expert_id ,expert_code,user_id, delete_flag,img_type, img_description, img_sort, img_url,add_explanation,created_time, updated_time,promote_type
+        id, expert_id ,expert_code,user_id, delete_flag,img_type, img_description, img_sort, img_url,add_explanation,created_time, updated_time
     </sql>
 
 </mapper>

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

@@ -18,11 +18,12 @@
         <result column="review_time" property="reviewTime" />
         <result column="commission_rate" property="commissionRate" />
         <result column="advance_rate" property="advanceRate" />
+        <result column="promote_type" property="promoteType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, expert_code, delete_flag, created_time, created_user_id, updated_time, updated_user_id,expert_status, add_explanation,refuse_because,review_time,commission_rate,advance_rate
+        id, user_id, expert_code, delete_flag, created_time, created_user_id, updated_time, updated_user_id,expert_status, add_explanation,refuse_because,review_time,commission_rate,advance_rate,promote_type
     </sql>
 
 </mapper>

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

@@ -25,13 +25,14 @@
         <result column="created_user_id" property="createdUserId" />
         <result column="updated_time" property="updatedTime" />
         <result column="updated_user_id" property="updatedUserId" />
-        <result column="first_funds_button" property="firstFundsButton" />
+        <result column="advance_payment_status" property="advancePaymentStatus" />
         <result column="end_funds_button" property="endFundsButton" />
+        <result column="reason_refusal" property="reasonRefusal" />
     </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, first_funds_button, end_funds_button
+        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
     </sql>
 
 </mapper>

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

@@ -142,17 +142,19 @@ public class LifeUserExpertController {
             @ApiImplicitParam(name = "size", value = "分页条数", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "realName", value = "真实姓名", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "userPhone", value = "联系电话", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "status", value = "订单状态", dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "createdTime", value = "下单开始时间", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "endTime", value = "下单结束时间", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "advancePaymentStatus", value = "预付款审核状态", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "orderCreatedTime", value = "下单开始时间", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "orderEndTime", value = "下单结束时间", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "name", value = "套餐名称", dataType = "String", paramType = "query"),
+            @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, Integer status, String createdTime, String endTime ,String name, Integer userId) {
+    public R<List<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, status, createdTime, endTime, name, userId));
+        return R.data(lifeUserExpertService.getAdvancePaymentList(page, size, realName, userPhone, advancePaymentStatus, orderCreatedTime, orderEndTime, name, userId));
     }
 
 

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

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.ExpertImg;
+import shop.alien.entity.store.vo.ExpertImgVo;
 import shop.alien.entity.store.vo.LifeUserExpertVo;
 import shop.alien.store.service.StoreUserExpertService;
 
@@ -55,7 +56,7 @@ public class StoreUserExpertController {
 @ApiOperation("申请达人，上传图片以及补充说明")
 @ApiOperationSupport(order = 4)
 @PostMapping("/applyExpert")
-public R<Map<String, String>> applyExpert(@RequestBody ExpertImg expertImgs) {
+public R<Map<String, String>> applyExpert(@RequestBody ExpertImgVo expertImgs) {
     log.info("StoreUserExpertController.applyExpert?expertImgs={}", expertImgs);
     if (null == expertImgs) {
         return R.fail("参数错误");

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

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

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.ExpertImg;
 import shop.alien.entity.store.LifeUserExpert;
+import shop.alien.entity.store.vo.ExpertImgVo;
 import shop.alien.entity.store.vo.LifeUserExpertVo;
 
 import java.util.List;
@@ -18,5 +19,5 @@ public interface StoreUserExpertService extends IService<LifeUserExpert> {
     List<LifeUserExpertVo> ifExpert(String id);
 
 
-    Map<String, String> getapplyExpert(ExpertImg expertImgs);
+    Map<String, String> getapplyExpert(ExpertImgVo expertImgs);
 }

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

@@ -390,27 +390,29 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
         if (CollectionUtils.isEmpty(list)){
             return expertVo;
         }
-        String  promoteType=list.get(0).getPromoteType();
-        expertVo.setPromoteType(promoteType);
         return expertVo;
     }
 
     @Override
-    public List<LifeUserExpertOrderVo> getAdvancePaymentList(Integer page, Integer size,String realName, String userPhone, Integer status, String createdTime, String endTime ,String name, Integer userId) {
+    public List<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("order.delete_flag", 0);
+        wrapper.eq("ccc.delete_flag", 0);
+        wrapper.eq("user.delete_flag", 0);
+        wrapper.eq("info.delete_flag",0);
+        wrapper.eq("expert.delete_flag",0);
+        wrapper.eq("package.delete_flag",0);
         wrapper.like(StringUtils.isNotEmpty(realName), "user.real_name", realName);
         wrapper.like(StringUtils.isNotEmpty(userPhone), "user.user_phone", userPhone);
-        wrapper.eq(status != null, "order.status", status);
-        if (createdTime != null && !createdTime.isEmpty()){
-            wrapper.gt("order.created_time", createdTime);
+        if (advancePaymentStatus != null && !advancePaymentStatus.isEmpty()){
+            wrapper.eq("ccc.advance_payment_status", advancePaymentStatus);
         }
-        if (endTime != null && !endTime.isEmpty()) {
-            wrapper.lt("order.created_time", endTime);
+        if (orderCreatedTime != null && !orderCreatedTime.isEmpty()){
+            wrapper.gt("ccc.order_time", orderCreatedTime);
         }
-        List<LifeUserExpertOrderVo> a=lifeUserExpertOrderMapper.getAdvancePaymentList(wrapper);
-
-        return null;
+        if (orderEndTime != null && !orderEndTime.isEmpty()) {
+            wrapper.lt("ccc.order_time", orderEndTime);
+        }
+        return lifeUserExpertOrderMapper.getAdvancePaymentList(wrapper);
     }
 
 }

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

@@ -10,6 +10,7 @@ import shop.alien.entity.store.ExpertImg;
 import shop.alien.entity.store.LifeNotice;
 import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.LifeUserExpert;
+import shop.alien.entity.store.vo.ExpertImgVo;
 import shop.alien.entity.store.vo.LifeUserExpertVo;
 import shop.alien.mapper.ExpertImgMapper;
 import shop.alien.mapper.LifeNoticeMapper;
@@ -203,7 +204,7 @@ public class StoreUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper
     }
 
     @Override
-    public Map<String, String> getapplyExpert(ExpertImg expertImgs) {
+    public Map<String, String> getapplyExpert(ExpertImgVo expertImgs) {
         Map<String, String> result = new HashMap<>();
         //先对expertImgs进行判断若为空直接返回若不为空则进行保存操作
         if (expertImgs == null) {
@@ -217,6 +218,7 @@ public class StoreUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper
         expert.setUpdatedTime(new Date());
         expert.setExpertStatus(1);
         expert.setAddExplanation(expertImgs.getAddExplanation());
+        expert.setPromoteType(expertImgs.getPromoteType());
         lifeUserExpertMapper.insert(expert);
         Integer insertedId = expert.getId();
         for (String imgUrl : expertImgs.getImgUrl().split(",")) {
@@ -228,7 +230,6 @@ public class StoreUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper
             expertImg.setExpertId(insertedId);
             expertImg.setImgType(0);
             expertImg.setUserId(expertImgs.getUserId());
-            expertImg.setPromoteType(expertImgs.getPromoteType());
             expertImgMapper.insert(expertImg);
         }
         //发送消息