From bfaa6a11437b668f5762f5346d07b9125b5a6ff9 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 14 Apr 2025 17:51:07 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E9=95=BF=E5=BA=A6=E8=B0=83=E6=95=B4=EF=BC=9B?= =?UTF-8?q?=E5=AE=89=E7=BD=AE=E6=9E=B6=E6=9E=84=E5=8E=86=E5=8F=B2=E7=BD=91?= =?UTF-8?q?=E4=BD=93=E6=98=BE=E7=A4=BA=E5=B7=A6=E5=8F=B3=E5=8C=BA=E5=A5=97?= =?UTF-8?q?=E6=95=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CuMemberServiceImpl.java | 8 +++++ .../api/ApiMemberStructureController.java | 4 +-- .../manage/MemberStructureController.java | 2 +- .../member/achieve/CuMemberTreeMapper.xml | 12 +++++--- .../hzs/sale/order/vo/WaresOrderInfoVo.java | 29 +++++++++++-------- .../com/hzs/sale/order/vo/WaresOrderVo.java | 28 +++++++++++------- .../mapper/sale/order/SaOrderMapper.xml | 1 + 7 files changed, 55 insertions(+), 29 deletions(-) diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index f181f440..8fc325ae 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -2357,6 +2357,14 @@ public class CuMemberServiceImpl extends ServiceImpl i tree.putExtra("leftRepeatPurchaseSurplus", numberformat.format(pvComputeExchangeRate(treeNode.getRepABalance(), pkSettleCountry, inExchangeRate))); // 右区复购结余 tree.putExtra("rightRepeatPurchaseSurplus", numberformat.format(pvComputeExchangeRate(treeNode.getRepBBalance(), pkSettleCountry, inExchangeRate))); + // 左区新増套数 + tree.putExtra("aNewBox", treeNode.getANewBox()); + // 右区新増套数 + tree.putExtra("bNewBox", treeNode.getBNewBox()); + // 右区累计套数 + tree.putExtra("aSumBox", treeNode.getASumBox()); + // 右区累计套数 + tree.putExtra("bSumBox", treeNode.getBSumBox()); }); return build; } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java index 6bccc9a7..45373e00 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java @@ -79,7 +79,7 @@ public class ApiMemberStructureController extends BaseController { /** * 安置架构网体 */ - @GetMapping("az-framework") + @GetMapping("/az-framework") public AjaxResult azFramework(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { if (level == null) { level = 7; @@ -371,7 +371,7 @@ public class ApiMemberStructureController extends BaseController { /** * 推荐架构网体 */ - @GetMapping("tj-framework") + @GetMapping("/tj-framework") public AjaxResult tjFramework(Long memberSettlePeriodId, String memberCode, Integer level) { Date date = DateUtils.currentDate(); if (DateUtils.getCurrentHour() < 2) { diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java index a141f7e0..9db690c1 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java @@ -84,7 +84,7 @@ public class MemberStructureController extends BaseController { * 安置架构网体 */ @AccessPermissions("Arcgurecture") - @GetMapping("az-framework") + @GetMapping("/az-framework") public AjaxResult azFramework(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { if (level == null) { level = 7; diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml index 1d94af58..c388c80c 100644 --- a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml +++ b/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml @@ -86,6 +86,11 @@ + + + + + @@ -325,7 +330,7 @@ t.REP_A_BALANCE,t.REP_B_BALANCE,t.REP_A_NEW_AMOUNT,t.REP_B_NEW_AMOUNT,t.REP_A_NEW_PV,t.REP_B_NEW_PV,t.REP_A_SUM_AMOUNT, t.REP_B_SUM_AMOUNT,t.REP_A_SUM_PV,t.REP_B_SUM_PV,t.REGISTER_AMOUNT,t.REGISTER_PV,t.REGISTER_NEW_PV,t.UPGRADE_AMOUNT,t.UPGRADE_PV, t.UPGRADE_NEW_PV,t.REPURCHASE_AMOUNT,t.REPURCHASE_PV,t.REPURCHASE_NEW_PV,t.HI_FUN_AMOUNT,t.HI_FUN_PV,t.HI_FUN_NEW_PV,t.MALL_AMOUNT, - t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, + t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, t.a_new_box, t.b_new_box, t.a_sum_box, t.b_sum_box , cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode, @@ -470,7 +475,7 @@ t.REP_A_BALANCE,t.REP_B_BALANCE,t.REP_A_NEW_AMOUNT,t.REP_B_NEW_AMOUNT,t.REP_A_NEW_PV,t.REP_B_NEW_PV,t.REP_A_SUM_AMOUNT, t.REP_B_SUM_AMOUNT,t.REP_A_SUM_PV,t.REP_B_SUM_PV,t.REGISTER_AMOUNT,t.REGISTER_PV,t.REGISTER_NEW_PV,t.UPGRADE_AMOUNT,t.UPGRADE_PV, t.UPGRADE_NEW_PV,t.REPURCHASE_AMOUNT,t.REPURCHASE_PV,t.REPURCHASE_NEW_PV,t.HI_FUN_AMOUNT,t.HI_FUN_PV,t.HI_FUN_NEW_PV,t.MALL_AMOUNT, - t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND,level,cm.PK_AWARDS,cm.PK_SETTLE_COUNTRY, + t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, t.a_new_box, t.b_new_box, t.a_sum_box, t.b_sum_box, level,cm.PK_AWARDS,cm.PK_SETTLE_COUNTRY, cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID PK_MEMBER,cm.PK_COUNTRY,cme.MEMBER_CODE parentMemberCode, cm.PK_VERTEX ,cm.NICK_NAME @@ -604,8 +609,7 @@ t.REP_A_BALANCE,t.REP_B_BALANCE,t.REP_A_NEW_AMOUNT,t.REP_B_NEW_AMOUNT,t.REP_A_NEW_PV,t.REP_B_NEW_PV,t.REP_A_SUM_AMOUNT, t.REP_B_SUM_AMOUNT,t.REP_A_SUM_PV,t.REP_B_SUM_PV,t.REGISTER_AMOUNT,t.REGISTER_PV,t.REGISTER_NEW_PV,t.UPGRADE_AMOUNT,t.UPGRADE_PV, t.UPGRADE_NEW_PV,t.REPURCHASE_AMOUNT,t.REPURCHASE_PV,t.REPURCHASE_NEW_PV,t.HI_FUN_AMOUNT,t.HI_FUN_PV,t.HI_FUN_NEW_PV,t.MALL_AMOUNT, - t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, - + t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, t.a_new_box, t.b_new_box, t.a_sum_box, t.b_sum_box, level,cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode from ${tableName} t diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java index 0528e50f..1cb988c3 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java @@ -1,6 +1,7 @@ package com.hzs.sale.order.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Excel; import lombok.Data; @@ -190,29 +191,34 @@ public class WaresOrderInfoVo implements Serializable { /** * 订单金额 */ + @BigDecimalFormat @Excel(name = "订单金额") private BigDecimal orderAmount; + /** + * 订单业绩 + */ + @BigDecimalFormat + @Excel(name = "订单业绩") + private BigDecimal orderAchieve; + + /** + * 订单考核业绩，原bv + */ + @BigDecimalFormat + @Excel(name = "订单bv") + private BigDecimal orderAssAchieve; + /** * 订单邮费 */ + @BigDecimalFormat @Excel(name = "订单邮费") private BigDecimal postage; - /** - * 订单业绩 - */ - @Excel(name = "订单业绩") - private BigDecimal orderAchieve; - /** - * 订单考核业绩，原bv - */ - @Excel(name = "订单bv") - private BigDecimal orderAssAchieve; /** * 发货方式 值 */ - private Integer deliveryWay; /** @@ -230,7 +236,6 @@ public class WaresOrderInfoVo implements Serializable { /** * 运输方式 */ - private Integer tranType; /** * 运输方式label diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java index 0cd0249f..19cb1069 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java @@ -184,28 +184,33 @@ public class WaresOrderVo implements Serializable { @Excel(name = "订单金额") private BigDecimal orderAmount; - /** - * 邮费 - */ - @Excel(name = "订单邮费") - private BigDecimal postage; /** * 订单业绩 */ - @Excel(name = "订单业绩($)") + @BigDecimalFormat + @Excel(name = "订单业绩") private BigDecimal orderAchieve; /** * 订单考核业绩，原bv */ + @BigDecimalFormat @Excel(name = "订单bv") private BigDecimal orderAssAchieve; + + + /** + * 邮费 + */ + @BigDecimalFormat + @Excel(name = "订单邮费") + private BigDecimal postage; + /** * 发货方式 值 */ - private Integer deliveryWay; /** @@ -217,13 +222,11 @@ public class WaresOrderVo implements Serializable { /** * 发货类型 */ - private Integer shippingChannel; /** * 发货类型 字符 */ - private String shippingChannelVal; /** * 发货类型 字符 @@ -239,7 +242,6 @@ public class WaresOrderVo implements Serializable { /** * 运输方式 */ - private Integer tranType; /** * 运输方式label @@ -352,5 +354,11 @@ public class WaresOrderVo implements Serializable { */ private String skuCode; + /** + * 订单套数 + */ + @Excel(name = "订单套数") + private Integer boxNum; + } diff --git a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index 2cde7f23..cca94d8e 100644 --- a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -859,6 +859,7 @@ so.PAY_TIME payTime, so.ORDER_AMOUNT orderAmount, so.ORDER_ACHIEVE orderAchieve, + so.box_num, m.MEMBER_CODE buyMemberCode, m.MEMBER_NAME buyMemberName, so.ORDER_ASS_ACHIEVE orderAssAchieve,