From 408aa89cc29085d9f34c25979df19e4bbfc0538a Mon Sep 17 00:00:00 2001 From: zhangheng Date: Mon, 29 Sep 2025 09:08:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?##=20bug421=20=E6=9F=A5=E8=AF=A2=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/member/base/CuMemberRetailMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml index e5057679..e924e9f9 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml @@ -108,9 +108,9 @@ COUNT(CASE WHEN curd.STAGE = 2 AND curd.STAGE_STATUS = 1 THEN 1 END) AS secondOrderQuantity, COUNT(CASE WHEN curd.STAGE = 3 AND curd.STAGE_STATUS = 1 THEN 1 END) AS threeOrderQuantity FROM - CU_MEMBER_RETAIL2084 cmr + #{settleTableName} cmr LEFT JOIN CU_MEMBER cu ON cmr.PK_MEMBER = cu.PK_ID - LEFT JOIN CU_MEMBER_RETAIL_DETAIL2084 curd ON cmr.PK_MEMBER = curd.PK_MEMBER + LEFT JOIN #{settleDetailTableName} curd ON cmr.PK_MEMBER = curd.PK_MEMBER WHERE cmr.PK_MEMBER = #{userId} GROUP BY From 072ba08f67ff2e9fd483c402f4a9e61091941032 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Mon, 29 Sep 2025 09:26:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?##=20bug421=20=E6=9F=A5=E8=AF=A2=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9,=E6=9F=A5=E8=AF=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/member/base/controller/api/ApiMemberController.java | 3 +++ .../resources/mapper/member/base/CuMemberRetailMapper.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java index f93a946e..ba626f08 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java @@ -467,6 +467,9 @@ public class ApiMemberController extends BaseController { return AjaxResult.error("数据查询错误,请联系客服处理"); } MemberPointVO memberPointVO = iCuMemberRetailService.getMemberPointByUserId(settleDetailTableName,settleTableName,userId); + if (memberPointVO == null) { + return AjaxResult.error("数据查询错误,请联系客服处理"); + } memberPointVO.setMemberSettlePeriod(csPeriod.getSettleDate()); startPage(); return AjaxResult.success(memberPointVO); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml index e924e9f9..07818ac7 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml @@ -108,9 +108,9 @@ COUNT(CASE WHEN curd.STAGE = 2 AND curd.STAGE_STATUS = 1 THEN 1 END) AS secondOrderQuantity, COUNT(CASE WHEN curd.STAGE = 3 AND curd.STAGE_STATUS = 1 THEN 1 END) AS threeOrderQuantity FROM - #{settleTableName} cmr + ${settleTableName} cmr LEFT JOIN CU_MEMBER cu ON cmr.PK_MEMBER = cu.PK_ID - LEFT JOIN #{settleDetailTableName} curd ON cmr.PK_MEMBER = curd.PK_MEMBER + LEFT JOIN ${settleDetailTableName} curd ON cmr.PK_MEMBER = curd.PK_MEMBER WHERE cmr.PK_MEMBER = #{userId} GROUP BY From 6e730f5da1cb63bd1a7af8a0a142df528b42cb4b Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Mon, 29 Sep 2025 09:39:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?##=20Fix=20-=20=E7=94=84=E9=80=89=E4=B8=93?= =?UTF-8?q?=E5=8C=BA=E7=9A=84=E8=AE=A2=E5=8D=95=E6=92=A4=E5=8D=95=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5[http://47.94.148.201:8081/index.php=3Fm=3Dbug&f=3Dvie?= =?UTF-8?q?w&bugID=3D423]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hzs/common/core/enums/ETradeType.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java index 70bfce68..d2f7c285 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java @@ -24,6 +24,7 @@ public enum ETradeType { RETAIL_REPURCHASE_ORDER(143, 0, "复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 143, EOrderType.RETAIL_REPURCHASE.getValue()), RETAIL_CONSUME_ORDER(144, 0, "重消订单", 0, EnumsPrefixConstants.TRADE_TYPE + 144, EOrderType.RETAIL_CONSUME.getValue()), RETAIL_TICKET_ORDER(145, 0, "自主购票", 0, EnumsPrefixConstants.TRADE_TYPE + 145, EOrderType.RETAIL_TICKET.getValue()), + RETAIL_DISCOUNT_ORDER(147, 0, "五折订单", 0, EnumsPrefixConstants.TRADE_TYPE + 147, EOrderType.DISCOUNT_ORDER.getValue()), EMPTY_ORDER(190, 190, "空单注册", 0, EnumsPrefixConstants.TRADE_TYPE + 190, EOrderType.REGISTER_ORDER.getValue()), @@ -73,6 +74,9 @@ public enum ETradeType { REVOKE_RETAIL_CONSUME_ORDER(644, 0, "重消订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 644, -EOrderType.RETAIL_CONSUME.getValue()), REVOKE_RETAIL_TICKET_ORDER(645, 0, "自主购票撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 645, -EOrderType.RETAIL_TICKET.getValue()), + REVOKE_RETAIL_UPGRADE(642, 0, "甄选订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 642, -EOrderType.RETAIL_UPGRADE.getValue()), + REVOKE_DISCOUNT_ORDER(647, 0, "五折订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 647, -EOrderType.DISCOUNT_ORDER.getValue()), + ORDER_SELF_DELIVER(680, 0, "自提返还邮费", 0, EnumsPrefixConstants.TRADE_TYPE + 680, -99), ORDER_REFUND_ADJUST(690, 0, "退单金额补差", 0, EnumsPrefixConstants.TRADE_TYPE + 690, -99), From 0797ca19c7d10a28d33034e9240edc845539bec0 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Mon, 29 Sep 2025 09:46:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?##=20Opt=20-=20=E5=95=86=E5=93=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85,42=E5=BC=BA=E8=BD=AC41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retail/wares/controller/api/ApiRetailWaresController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java index 42da4d06..a509ba8e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java @@ -125,6 +125,9 @@ public class ApiRetailWaresController extends BaseController { public AjaxResult waresDetail(@Valid @RequestBody RetailWaresDetailParam param) { // 会员信息 CuMemberExt cuMemberExt = iMemberServiceApi.getMemberById(SecurityUtils.getUserId()).getData(); + if(param.getSpecialArea().equals(ESpecialArea.RETAIL_UPGRADE.getValue())){ + param.setSpecialArea(ESpecialArea.RETAIL_REGISTER.getValue()); + } // 添加系统类型 param.setSystemType(SecurityUtils.getSystemType());