From 0867a544886345de607d8159894430fcb9ea711e Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Mon, 14 Jul 2025 14:14:03 +0800 Subject: [PATCH] =?UTF-8?q?##=20Feat=20-=20=E4=BD=93=E7=B3=BB=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E5=9B=BE&=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E4=BB=98=E9=80=9A=E9=81=93=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/member/base/mapper/CuMemberMapper.java | 2 ++ .../com/hzs/member/base/service/ICuMemberService.java | 5 +++++ .../member/base/service/impl/CuMemberServiceImpl.java | 5 +++++ .../member/controller/api/RetailMemberController.java | 10 ++++++++++ .../retail/member/service/IMemberRetailService.java | 1 + .../member/service/impl/MemberRetailServiceImpl.java | 6 ++++++ .../com/hzs/retail/member/vo/RetailMemberInfoVO.java | 6 ++++++ .../resources/mapper/member/base/CuMemberMapper.xml | 10 ++++++++++ .../config/controller/manage/BdVertexController.java | 2 ++ .../java/com/hzs/system/config/param/VertexParam.java | 5 +++++ .../main/java/com/hzs/system/config/vo/VertexVo.java | 5 +++++ .../com/hzs/common/domain/member/ext/CuMemberExt.java | 6 ++++++ .../java/com/hzs/common/domain/vertex/BdVertex.java | 3 +++ .../pay/controller/notify/JdPayNotifyController.java | 3 ++- .../third/pay/jdpay/dto/JdPayTradeSuccessNotify.java | 1 + .../java/com/hzs/third/pay/service/IPayService.java | 2 +- .../com/hzs/third/pay/service/impl/PayServiceImpl.java | 5 ++++- sql/2025年7月14日_体系配置增加海报图.sql | 4 ++++ 18 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 sql/2025年7月14日_体系配置增加海报图.sql diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 6ae40f09..1c18f5e1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -626,4 +626,6 @@ public interface CuMemberMapper extends BaseMapper { */ BdTradeWhiteConfig selectMemberByUnderBlood(@Param("pkMember") Long pkMember, @Param("memberType") Integer memberType); + String getSharePosterImage(@Param("userId") Long userId); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index a1f0d14a..692fdc70 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -895,4 +895,9 @@ public interface ICuMemberService extends IService { */ BdTradeWhiteConfig selectMemberByUnderBlood(Long pkMember, Integer memberType); + /** + * 获取用户体系分享图片 + * @return + */ + String getSharePosterImage(); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index c1b4e9cf..03ae4f7e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -3232,4 +3232,9 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.selectMemberByUnderBlood(pkMember, memberType); } + @Override + public String getSharePosterImage() { + return baseMapper.getSharePosterImage(SecurityUtils.getUserId()); + } + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java index c44dda3c..c04e5e67 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java @@ -6,6 +6,7 @@ import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hzs.common.core.annotation.RepeatSubmitSimple; @@ -15,6 +16,7 @@ import com.hzs.common.core.enums.EGrade; import com.hzs.common.core.enums.ENoticeWebsiteType; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.utils.PageUtils; +import com.hzs.common.core.utils.sign.Base64Util; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; @@ -75,6 +77,14 @@ public class RetailMemberController extends BaseController { } return AjaxResult.success(retailMemberInfoVO); } + @GetMapping("/get-shared-image") + public AjaxResult getSharedImage() { + JSONObject result = new JSONObject(); + String url = iCuMemberService.getSharePosterImage(); + result.set("url", url); + result.set("base64", Base64Util.toUrlBase64(url)); + return AjaxResult.success(result); + } /** * 获取会员收益区域 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/IMemberRetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/IMemberRetailService.java index a5ebc350..bffe1806 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/IMemberRetailService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/IMemberRetailService.java @@ -15,4 +15,5 @@ public interface IMemberRetailService { */ RetailMemberInfoVO getMemberInfo(Long pkMember); + String getSharePosterImage(); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java index 5be7f781..383dbbb4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java @@ -91,9 +91,15 @@ public class MemberRetailServiceImpl implements IMemberRetailService { .pkCountry(cuMember.getPkCountry()) .pkSettleCountry(cuMember.getPkSettleCountry()) .isActivate(cuMember.getIsActivate()) + .sharePosterImage(cuMember.getSharePosterImage()) .build(); } return null; } + @Override + public String getSharePosterImage() { + return iCuMemberService.getSharePosterImage(); + } + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java index 25fbbecd..1c6bd6e9 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java @@ -141,4 +141,10 @@ public class RetailMemberInfoVO implements Serializable { */ private Integer isActivate; + + /** + * 分享海报图片 + */ + private String sharePosterImage; + } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index 8886444a..8886787e 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -1887,6 +1887,7 @@ @@ -2475,5 +2477,13 @@ and t0.category = 0) where rownum = 1 + diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexController.java index 57cb02e9..89ff9ffc 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexController.java @@ -100,6 +100,7 @@ public class BdVertexController extends BaseController { bdVertex.setPkMember(mb.getPkId()); bdVertex.setSystemType(systemType); bdVertex.setRegionVertexPkId(vertexParam.getRegionVertexPkId()); + bdVertex.setSharePosterImage(vertexParam.getSharePosterImage()); iBdVertexService.save(bdVertex); return AjaxResult.success(); } @@ -139,6 +140,7 @@ public class BdVertexController extends BaseController { bdVertex.setModifiedTime(new Date()); bdVertex.setPkModified(SecurityUtils.getUserId()); bdVertex.setRegionVertexPkId(vertexParam.getRegionVertexPkId()); + bdVertex.setSharePosterImage(vertexParam.getSharePosterImage()); if (null == bdVertex.getPkParent()) { bdVertex.setPkParent(0); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/param/VertexParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/param/VertexParam.java index 13ee2969..7320b41e 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/param/VertexParam.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/param/VertexParam.java @@ -59,4 +59,9 @@ public class VertexParam { private Integer sort; private Long regionVertexPkId; + + /** + * 分享海报图片 + */ + private String sharePosterImage; } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/VertexVo.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/VertexVo.java index 268beaa9..be88a70c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/VertexVo.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/VertexVo.java @@ -52,4 +52,9 @@ public class VertexVo extends BaseEntity { @TableField("REGION_VERTEX_PK_ID") private Long regionVertexPkId; + + /** + * 分享海报图片 + */ + private String sharePosterImage; } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberExt.java index cbb02146..884aa6d2 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberExt.java @@ -211,4 +211,10 @@ public class CuMemberExt extends CuMember { */ private String lastMemberCode; + + /** + * 分享海报图片 + */ + private String sharePosterImage; + } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/vertex/BdVertex.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/vertex/BdVertex.java index 3e9b5e5e..46fd5dca 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/vertex/BdVertex.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/vertex/BdVertex.java @@ -57,4 +57,7 @@ public class BdVertex extends BaseEntity { @TableField("REGION_VERTEX_PK_ID") private Long regionVertexPkId; + + @TableField("SHARE_POSTER_IMAGE") + private String sharePosterImage; } diff --git a/bd-third/src/main/java/com/hzs/third/pay/controller/notify/JdPayNotifyController.java b/bd-third/src/main/java/com/hzs/third/pay/controller/notify/JdPayNotifyController.java index 400cbbed..3489878b 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/controller/notify/JdPayNotifyController.java +++ b/bd-third/src/main/java/com/hzs/third/pay/controller/notify/JdPayNotifyController.java @@ -131,13 +131,14 @@ public class JdPayNotifyController extends JdBaseController { String thirdOrderCode = successNotify.getOutTradeNo(); // 订单编号 String orderCode = thirdOrderCode; + String acqOrderId = successNotify.getAcqOrderId(); // 订单金额 int tradeAmount = Integer.parseInt(successNotify.getTradeAmount()); BigDecimal payMoney = new BigDecimal(tradeAmount).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP); Integer payType = convertPayType(successNotify.getPayTool()); // 支付后续业务处理 - if (iPayService.notifyHandle(type, orderCode, thirdOrderCode, payNumber, payTime, payMoney, EPayChannel.JD, channelNumber, payType)) { + if (iPayService.notifyHandle(type, orderCode, thirdOrderCode, payNumber, payTime, payMoney, EPayChannel.JD, channelNumber, payType, acqOrderId)) { return SUCCESS; } } else { diff --git a/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayTradeSuccessNotify.java b/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayTradeSuccessNotify.java index a42ba4fb..c22e3ee2 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayTradeSuccessNotify.java +++ b/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayTradeSuccessNotify.java @@ -95,4 +95,5 @@ public class JdPayTradeSuccessNotify implements Serializable { */ private String installmentNum; + private String acqOrderId; } diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/IPayService.java b/bd-third/src/main/java/com/hzs/third/pay/service/IPayService.java index 7ee5101a..00ebce12 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/service/IPayService.java +++ b/bd-third/src/main/java/com/hzs/third/pay/service/IPayService.java @@ -29,7 +29,7 @@ public interface IPayService { EPayChannel ePayChannel, String channelNumber); boolean notifyHandle(String businessType, String businessCode, String originalOrder, String payNumber, Date payTime, BigDecimal payMoney, - EPayChannel ePayChannel, String channelNumber, Integer payType); + EPayChannel ePayChannel, String channelNumber, Integer payType, String acqOrderId); /** diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/PayServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/PayServiceImpl.java index 13456a99..52524fdd 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/PayServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/PayServiceImpl.java @@ -107,7 +107,9 @@ public class PayServiceImpl implements IPayService { } @Override - public boolean notifyHandle(String businessType, String businessCode, String originalOrder, String payNumber, Date payTime, BigDecimal payMoney, EPayChannel ePayChannel, String channelNumber, Integer payType) { + public boolean notifyHandle(String businessType, String businessCode, String originalOrder, String payNumber, + Date payTime, BigDecimal payMoney, EPayChannel ePayChannel, String channelNumber, + Integer payType, String acqOrderId) { // 校验支付信息状态、业务与支付金额是否一致等 TOnlinePayment onlinePayment = itOnlinePaymentService.queryByBusiness( ObjectUtil.isNotEmpty(businessType) ? Integer.valueOf(businessType) : null @@ -132,6 +134,7 @@ public class PayServiceImpl implements IPayService { onlinePayment.setPkModified(MagicNumberConstants.PK_ADMIN); onlinePayment.setModifiedTime(new Date()); onlinePayment.setPayType(payType); + onlinePayment.setChannelNumber(acqOrderId); if (null != ePayChannel) { onlinePayment.setPayChannel(ePayChannel.getValue()); } diff --git a/sql/2025年7月14日_体系配置增加海报图.sql b/sql/2025年7月14日_体系配置增加海报图.sql new file mode 100644 index 00000000..3903365f --- /dev/null +++ b/sql/2025年7月14日_体系配置增加海报图.sql @@ -0,0 +1,4 @@ +ALTER TABLE "BD_VERTEX" + ADD ("SHARE_POSTER_IMAGE" VARCHAR(200)); + +COMMENT ON COLUMN "BD_VERTEX"."SHARE_POSTER_IMAGE" IS '分享海报图'