diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java index 8d46623..2b7ddb9 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java @@ -557,7 +557,7 @@ public class MerchantOrderController { merchantOrder.setTransDt(new Date()); merchantOrder.setCreateDt(new Date()); merchantOrder.setStatus("1"); - merchantOrder.setEnterFee(merchantOrder.getConsumeFee()); + merchantOrder.setEnterFee(merchantOrder.getConsumeFee()-(merchantOrder.getConsumeFee()*0.0038)); merchantOrder.setAisleSwitch("0"); merchantOrder.setRate(new BigDecimal("38.00")); merchantOrder.setSettlementType(1); @@ -577,6 +577,15 @@ public class MerchantOrderController { } + public static void main(String[] args) { + Double a = 1000.00D; + Double s = 0.0038; + double v = a * s; + System.out.println("利率"+v); + double v1 = a - (a * s); + System.out.println("剩余"+v1); + } + /** * 主扫会员支付 * @param memberScanPayDTO @@ -1445,8 +1454,8 @@ public class MerchantOrderController { } @GetMapping("/couponList") - public Result>> getCouponListByOrderNumber(String orderNumber) { - List> couponList = merchantOrderService.getCouponList(orderNumber); + public Result>> getCouponListByOrderNumber(String orderNumber,Long id) { + List> couponList = merchantOrderService.getCouponList(orderNumber,id); return ResultGenerator.genSuccessResult(couponList); } diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java index 323c79d..f32e469 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java @@ -528,13 +528,13 @@ public class UserAppController { examineMoney = BigDecimal.ZERO; }else { // 累计总分润 - totalAccumulateShareMoney = userAccountByUserId.getBalance(); + totalAccumulateShareMoney = userAccountByUserId.getBalance().add(userAccountByUserId.getOutBalance()); //今日分润总额 totalShareMoneyToday = userAccountFlowMapper.selectSumByUserId(userId, DateUtils.getDayBegin(), DateUtils.getDayEnd()); // 可提现分润 - allowCashMoney = userAccountByUserId.getBalance(); + allowCashMoney = userAccountByUserId.getBalance().subtract(userAccountByUserId.getFreezeBalance()); //审核中的提现金额 examineMoney = userAccountByUserId.getFreezeBalance(); diff --git a/pluss-api-page/src/main/resources/log4j2-dev.xml b/pluss-api-page/src/main/resources/log4j2-dev.xml index 0932fdd..894a138 100644 --- a/pluss-api-page/src/main/resources/log4j2-dev.xml +++ b/pluss-api-page/src/main/resources/log4j2-dev.xml @@ -52,12 +52,12 @@ - - - + + + - + diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderVOMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderVOMapper.java index 396c7d5..16cf158 100644 --- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderVOMapper.java +++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderVOMapper.java @@ -21,7 +21,7 @@ public interface MerchantOrderVOMapper extends BaseMapper { * @param orderNumber 订单号 * @return */ - List> getOnlineCouponList(@Param("orderNumber") String orderNumber); + List> getOnlineCouponList(@Param("orderNumber") String orderNumber,@Param("id")Long id); /** @@ -29,5 +29,5 @@ public interface MerchantOrderVOMapper extends BaseMapper { * @param orderNumber 订单号 * @return */ - List> getOfflineCouponList(@Param("orderNumber") String orderNumber); + List> getOfflineCouponList(@Param("orderNumber") String orderNumber,@Param("id")Long id); } \ No newline at end of file diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAccountMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAccountMapper.java index 3e86747..51c7dad 100644 --- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAccountMapper.java +++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAccountMapper.java @@ -13,10 +13,10 @@ import java.math.BigDecimal; public interface UserAccountMapper extends BaseMapper { - @Select(value = "select user_id AS userId,freeze_balance AS freezeBalance,balance,out_balance AS out_balance,create_time AS createTime,update_time AS updateTime from tb_pluss_user_account where user_id=#{userId}") + @Select(value = "select user_id AS userId,freeze_balance AS freezeBalance,balance,out_balance AS outBalance,create_time AS createTime,update_time AS updateTime from tb_pluss_user_account where user_id=#{userId}") UserAccount selectUserByUserId(@Param("userId")Integer userId,Integer t); - @Select(value = "select user_id AS userId,freeze_balance AS freezeBalance,balance,out_balance AS out_balance,create_time AS createTime,update_time AS updateTime from tb_pluss_user_account where user_id=#{userId} for update") + @Select(value = "select user_id AS userId,freeze_balance AS freezeBalance,balance,out_balance AS outBalance,create_time AS createTime,update_time AS updateTime from tb_pluss_user_account where user_id=#{userId} for update") UserAccount selectUserByUserId(@Param("userId")Integer userId); @Update(value = "update tb_pluss_user_account set freeze_balance=freeze_balance+#{amount} where user_id=#{userId}") diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerFlowMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerFlowMapper.java index 933939b..5a1dcd5 100644 --- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerFlowMapper.java +++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerFlowMapper.java @@ -18,14 +18,18 @@ public interface UserMakerFlowMapper extends BaseMapper { "\tmf.biz_code AS bizCode,\n" + "\tmf.biz_name AS bizName,\n" + "\tbi.alias AS userName,\n" + - "\tmf.amount,\n" + + "\tmf.amount AS lowerAmount,\n" + "\tmf.create_time AS createTime,\n" + - "\tmo.consumeFee AS lowerAmount \n" + + "\tmo.consumeFee AS amount \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}") + "WHERE\n" + + "\tmf.user_id = #{userId} \n" + + "\tAND mo.`status` = 1\n" + + "ORDER BY\n" + + "\tid DESC \n" + + "\tLIMIT #{pageSize} OFFSET #{offset}") List selectByUserId(@Param("userId") Long userId, @Param("pageSize") Integer pageSize, @Param("offset") Integer offset); } diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerQuotaMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerQuotaMapper.java index f14df14..02bc0b5 100644 --- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerQuotaMapper.java +++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerQuotaMapper.java @@ -14,12 +14,12 @@ import java.math.BigDecimal; */ public interface UserMakerQuotaMapper extends BaseMapper { BigDecimal sumQuota(@Param("userId") Long userId); - @Update(value = "update tb_pluss_user_maker_quota set amount=#{amount} where userId=#{userId}") + @Update(value = "update tb_pluss_user_maker_quota set amount=amount+#{amount} where userId=#{userId}") Integer updateMakerFreeze(@Param("userId") Integer userId, @Param("amount") BigDecimal amount); - @Select(value ="SELECT * FROM tb_pluss_user_maker_quota WHERE userId = #{userId}") - UserMakerQuota selectByUserId(@Param("userId") Long userId); @Select(value ="SELECT * FROM tb_pluss_user_maker_quota WHERE userId = #{userId}") UserMakerQuota selectByUserId(@Param("userId") Integer userId); +// @Select(value ="SELECT * FROM tb_pluss_user_maker_quota WHERE userId = #{userId}") +// UserMakerQuota selectByUserId(@Param("userId") Integer userId); } diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml index b6128a1..2e3179b 100644 --- a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml +++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml @@ -15,8 +15,13 @@ SELECT * FROM tb_pluss_merchant_order - WHERE + orderNumber = #{orderNumber} + + AND id=#{id} + + + @@ -30,7 +35,11 @@ SELECT * FROM tb_pluss_merchant_order - WHERE + orderNumber = #{orderNumber} + + AND id=#{id} + + diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAccount.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAccount.java index 1598eda..779abd7 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAccount.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAccount.java @@ -19,9 +19,7 @@ import java.util.Date; public class UserAccount implements Serializable { - - @TableField("user_id") - @TableId(value = "user_id", type = IdType.AUTO) + @TableId(type = IdType.NONE,value = "user_id") private Integer userId; @TableField("freeze_balance") private BigDecimal freezeBalance; diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMakerFlow.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMakerFlow.java index d4c11e0..c1b54e2 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMakerFlow.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMakerFlow.java @@ -29,6 +29,8 @@ public class UserMakerFlow implements Serializable { private String bizCode; @TableField("biz_name") private String bizName; + @TableField("orderNumber") + private String orderNumber; @TableField("amount") private BigDecimal amount; @TableField("balance") diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java index de02a8c..07032e6 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java @@ -24,7 +24,7 @@ import java.util.Date; // " ) t") @TableName("(\n" + " SELECT t1.*, t2.updateTime refundTime FROM tb_pluss_merchant_order t1\n" + - " LEFT JOIN tb_pluss_merchant_order t2 ON t1.orderNumber = t2.orderNumber AND t1.status = 1 AND t2.status = 2\n" + + " LEFT JOIN tb_pluss_merchant_order t2 ON t1.orderNumber = t2.orderNumber AND t1.status = 1 AND t2.status = 2 AND t2.status = 6\n" + " ) t") @Accessors(chain = true) public class MerchantOrderVO extends MerchantOrder { diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/UserMakerQuota/impl/UserMakerQuotaServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/UserMakerQuota/impl/UserMakerQuotaServiceImpl.java index 5100b2a..b173ccc 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/UserMakerQuota/impl/UserMakerQuotaServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/UserMakerQuota/impl/UserMakerQuotaServiceImpl.java @@ -75,14 +75,15 @@ public class UserMakerQuotaServiceImpl extends ServiceImpl= 0) { @@ -140,10 +141,11 @@ public class UserMakerQuotaServiceImpl extends ServiceImpl getSpreadData(String userId) { @@ -71,7 +78,7 @@ public class PromoterMainPageServiceImpl implements MainPageService { queryUserApp = queryUserAppList2.get(0); } - Double promoteFee; + BigDecimal promoteFee; Double todayProfit; Integer totalOrderCount; @@ -80,9 +87,11 @@ public class PromoterMainPageServiceImpl implements MainPageService { queryMap.put("userId", userId); queryMap.put("status", 1); // 累计总收益 - promoteFee = merchantProfitService.queryMerchantProfitSumPrice(queryMap); - if (promoteFee == null) { - promoteFee = 0d; + UserAccount userAccountByUserId = userAccountService.getUserAccountByUserId(Integer.valueOf(userId)); + if(ObjectUtil.isEmpty(userAccountByUserId)){ + promoteFee=BigDecimal.ZERO; + }else { + promoteFee = userAccountByUserId.getBalance().add(userAccountByUserId.getOutBalance()); } //今日收款笔数 @@ -90,8 +99,9 @@ public class PromoterMainPageServiceImpl implements MainPageService { queryMap.put("retype", "1"); totalOrderCount = merchantProfitMapper.queryMerchantProfitPageCountV2(userId); todayProfit = merchantProfitService.queryMerchantProfitSumPrice(queryMap); + //今日收益 - BigDecimal todaySum = merchantProfitMapper.getTodaySum(userId); + BigDecimal todaySum = userAccountFlowMapper.selectSumByUserId(Long.valueOf(userId), DateUtils.getDayBegin(), DateUtils.getDayEnd());; //今日新增商户数 Integer newMerchantCount = userAppMapper.selectUserAppWithChannelStatusCountV2(userId, DateUtils.getDayBegin(), DateUtils.getDayEnd()); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderService.java index 06ca892..a57786f 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderService.java @@ -324,7 +324,7 @@ public interface MerchantOrderService extends IService { */ void readCSV(String path); - List> getCouponList(String orderNumber); + List> getCouponList(String orderNumber,Long id); Result updateOrderStatus(JSONObject result,MerchantOrder order); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java index 2e0fca0..c2d81d2 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java @@ -292,7 +292,6 @@ public class MerchantOrderServiceImpl extends ServiceImpl pageQuery = queryWrapper.clone(); pageQuery.orderByDesc(MerchantOrder::getCreateDt); - Page page = new Page<>(merchantOrder.getPage(), merchantOrder.getSize()); IPage pageMerchantOrder = merchantOrderVOMapper.selectPage(page, pageQuery); @@ -310,6 +309,11 @@ public class MerchantOrderServiceImpl extends ServiceImpl resultMap = new HashMap<>(); @@ -339,7 +343,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl> getCouponList(String orderNumber) { + public List> getCouponList(String orderNumber,Long id) { MerchantOrder merchantOrder = new MerchantOrder().setOrderNumber(orderNumber); + if (id != null){ + merchantOrder.setId(id); + } MerchantOrder one = getOne(new QueryWrapper<>(merchantOrder)); if (one == null) { throw new MsgException("订单不存在"); } if ("10".equals(one.getOrderType())) { - return merchantOrderVOMapper.getOnlineCouponList(orderNumber); + List> onlineCouponList = merchantOrderVOMapper.getOnlineCouponList(orderNumber,id); + for (Map item : onlineCouponList) { + if ("6".equals(item.get("status"))){ + item.put("consumeFee",item.get("refundAmt")); + } + } + return onlineCouponList; + } else { - return merchantOrderVOMapper.getOfflineCouponList(orderNumber); + List> offlineCouponList = merchantOrderVOMapper.getOfflineCouponList(orderNumber,id); + for (Map item : offlineCouponList) { + if ("6".equals(item.get("status"))){ + item.put("consumeFee",item.get("refundAmt")); + } + } + return offlineCouponList; } } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java index c68f945..fb17b0a 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java @@ -116,6 +116,8 @@ public class MerchantProfitServiceImpl extends ServiceImpl teamList(String typeCode, Long userId,Integer page,Integer size, String name) { + Integer pagerSize = size; + Integer offset = (page - 1) * size; switch (typeCode){ case "AG": typeCode = "FB"; @@ -135,8 +137,19 @@ public class MerchantProfitServiceImpl extends ServiceImpl teamList= merchantProfitMapper.getTeamList(typeCode, userId, page,size,name); Integer countChild = merchantProfitMapper.getCountChild(userId, typeCode); - Integer pagerSize = size; - Integer offset = (page - 1) * size; + UserPromotion userPromotion = userPromotionMapper.selectByPrimaryKey(userId); + if (Objects.equals(userPromotion.getIsExtend(), "1")){ + List teamList = merchantProfitMapper.getTeamList(typeCode, userId, name, pagerSize, offset); + for (MerchantProfitVO values : teamList) { + values.setCurrentMonth(mapperOrderMapper.getPlatformAmtYestday(values.getMerchantCode(), + DateUtils.getBeginDayOfMonth(), DateUtils.getEndDayOfMonth())); + values.setConsumeFee(mapperOrderMapper.getAmountData(values.getMerchantCode())); + } + HashMap hashMap = new HashMap<>(); + hashMap.put("total", countChild); + hashMap.put("teamList", teamList); + return hashMap; + } //商户列表 if ("MC".equals(typeCode)) { List teamList = merchantProfitMapper.getMerchantTeamList(typeCode, userId, name, pagerSize, offset); @@ -302,6 +315,7 @@ public class MerchantProfitServiceImpl extends ServiceImpl