创客额度相关更改逻辑

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAccountFlowMapper.java

@@ -2,6 +2,7 @@ package cn.pluss.platform.mapper;
 
 import cn.pluss.platform.entity.UserAccountFlow;
 import cn.pluss.platform.entity.UserMakerFlow;
+import cn.pluss.platform.vo.UserMakerQuotaVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,6 +16,20 @@ import java.util.List;
 @Mapper
 public interface UserAccountFlowMapper extends BaseMapper<UserAccountFlow> {
 
-    @Select("SELECT * FROM tb_pluss_user_account_flow WHERE user_id = #{userId} AND biz_code = 'SD' order by id desc  limit #{pageSize}  offset  #{offset} ")
+    @Select("SELECT\n" +
-    List<UserAccountFlow> selectByUserIdType(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset);
+            "\tmf.id,\n"+
+            "\tbi.alias AS userName,\n" +
+            "\tmf.orderNumber,\n" +
+            "\tmf.create_time AS createTime,\n" +
+            "\tmo.consumeFee AS lowerAmount,\n" +
+            "\t(mo.consumeFee - mo.enterFee) AS amount\n" +
+            "FROM\n" +
+            "\ttb_pluss_user_maker_flow mf \n" +
+            "\tLEFT JOIN tb_pluss_merchant_base_info bi ON bi.userId = mf.user_id\n" +
+            "\tLEFT JOIN tb_pluss_merchant_order mo ON mf.orderNumber = mo.orderNumber\n" +
+            "WHERE\n" +
+            "\tmf.user_id = #{userId}\n" +
+            "\tAND mf.biz_code = 'LD'\n" +
+            "\torder by id desc  limit #{pageSize}  offset  #{offset} ")
+    List<UserMakerQuotaVO> selectByUserIdType(@Param("userId") Long userId, @Param("pageSize") Integer pageSize, @Param("offset") Integer offset);
 }

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerFlowMapper.java

@@ -1,6 +1,7 @@
 package cn.pluss.platform.mapper;
 
 import cn.pluss.platform.entity.UserMakerFlow;
+import cn.pluss.platform.vo.UserMakerQuotaVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -12,6 +13,19 @@ import java.util.List;
  */
 public interface UserMakerFlowMapper  extends BaseMapper<UserMakerFlow> {
 
-    @Select(value = "SELECT id,user_id AS userId ,biz_code AS bizCode ,biz_name AS bizName ,amount,balance,create_time AS createTime ,remark FROM tb_pluss_user_maker_flow WHERE user_id = #{userId} order by id desc  limit #{pageSize}  offset  #{offset}  ")
+    @Select(value = "SELECT\n" +
-    List<UserMakerFlow> selectByUserId(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset);
+            "\tmf.id,\n" +
+            "\tmf.biz_code AS bizCode,\n" +
+            "\tmf.biz_name AS bizName,\n" +
+            "\tbi.alias AS userName,\n" +
+            "\tmf.amount,\n" +
+            "\tmf.create_time AS createTime,\n" +
+            "\tmo.consumeFee AS lowerAmount \n" +
+            "FROM\n" +
+            "\t`tb_pluss_user_maker_flow` mf\n" +
+            "\tLEFT JOIN tb_pluss_merchant_base_info bi ON mf.user_id = bi.userId\n" +
+            "\tLEFT JOIN tb_pluss_merchant_order mo ON mf.orderNumber = mo.orderNumber \n" +
+            "\tWHERE mf.user_id = #{userId}\n" +
+            "\torder by id desc limit #{pageSize}  offset #{offset}")
+    List<UserMakerQuotaVO> selectByUserId(@Param("userId") Long userId, @Param("pageSize") Integer pageSize, @Param("offset") Integer offset);
 }

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAccountFlow.java

@@ -28,8 +28,6 @@ public class UserAccountFlow implements Serializable {
     private String bizName;
 
     private BigDecimal amount;
-    @TableField("order_amount")
-    private BigDecimal orderAmount;
 
     private BigDecimal balance;
 

pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserMakerQuotaVO.java

@@ -13,6 +13,12 @@ import java.util.Date;
 public class UserMakerQuotaVO {
     private Integer id;
 
+    private String orderNumber;
+
+    private String bizName;
+
+    private String bizCode;
+
     private String userName;
 
     private BigDecimal amount;

pluss-service-bundle/src/main/java/cn/pluss/platform/UserMakerQuota/impl/UserMakerQuotaServiceImpl.java

@@ -88,38 +88,15 @@ public class UserMakerQuotaServiceImpl extends ServiceImpl<UserMakerQuotaMapper,
         Integer pageSize = size;
         Integer offset = (page-1)*size;
         UserApp userApp = userAppService.queryUserAppByToken();
-        MerchantBaseInfo merchantBaseInfoByUserId = merchantBaseInfoService.getMerchantBaseInfoByUserId(String.valueOf(userApp.getUserId()));
         switch (type) {
             //额度明细
             case 1:
-                List<UserMakerFlow> userMakerFlowsList = userMakerFlowMapper.selectByUserId(userApp.getUserId(), pageSize, offset);
+                List<UserMakerQuotaVO> userMakerFlowsList = userMakerFlowMapper.selectByUserId(userApp.getUserId(), pageSize, offset);
-                List<UserMakerQuotaVO> vos = new ArrayList<>();
+                return userMakerFlowsList;
-                for (UserMakerFlow userMakerFlow : userMakerFlowsList) {
-                    UserMakerQuotaVO userMakerQuotaVO = new UserMakerQuotaVO();
-                    userMakerQuotaVO.setUserName(merchantBaseInfoByUserId == null?"下级商户":merchantBaseInfoByUserId.getAlias());
-                    userMakerQuotaVO.setAmount(userMakerFlow.getAmount());
-                    userMakerQuotaVO.setCreateTime(userMakerFlow.getCreateTime());
-                    if (userMakerFlow.getAmount().compareTo(new BigDecimal(BigInteger.ZERO))>0) {
-                        userMakerQuotaVO.setLowerAmount(userMakerFlow.getAmount().multiply(new BigDecimal("2")).setScale(2, RoundingMode.DOWN));
-                    }else {
-                        userMakerQuotaVO.setLowerAmount(userMakerFlow.getAmount());
-                    }
-                    vos.add(userMakerQuotaVO);
-                }
-                return vos;
             //返现明细
             case 2:
-                List<UserAccountFlow> userAccountFlowsList = userAccountFlowMapper.selectByUserIdType(userApp.getUserId(),pageSize, offset);
+                List<UserMakerQuotaVO> userAccountFlowsList = userAccountFlowMapper.selectByUserIdType(userApp.getUserId(),pageSize, offset);
-                List<UserMakerQuotaVO> userAccountVos = new ArrayList<>();
+                return userAccountFlowsList;
-                for (UserAccountFlow userAccountFlow : userAccountFlowsList) {
-                    UserMakerQuotaVO userMakerQuotaVO = new UserMakerQuotaVO();
-                    userMakerQuotaVO.setUserName(merchantBaseInfoByUserId == null?"下级商户":merchantBaseInfoByUserId.getAlias());
-                    userMakerQuotaVO.setAmount(userAccountFlow.getAmount());
-                    userMakerQuotaVO.setCreateTime(userAccountFlow.getCreateTime());
-                    userMakerQuotaVO.setLowerAmount(userAccountFlow.getOrderAmount());
-                    userAccountVos.add(userMakerQuotaVO);
-                }
-                return userAccountVos;
         }
         return new ArrayList<UserMakerQuotaVO>();
     }