From 900e3f57b66cc6a5a77385a34cf65d1d554f4a30 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 19 Jul 2023 14:56:05 +0800 Subject: [PATCH] //..mall --- .../controller/basic/WxMallController.java | 23 +++++++ .../java/com/iformall/domain/po/WxCoupon.java | 2 +- .../domain/po/WxMallNoticeContact.java | 31 +++++++++ .../mapper/WxMallNoticeContactMapper.java | 17 +++++ .../com/iformall/service/WxMallService.java | 6 ++ .../service/impl/WxMallServiceImpl.java | 28 ++++++-- .../entity/WxComposeChildOrderShare.java | 2 +- .../pay/service/fee/TtServiceFeeService.java | 2 +- .../pay/service/fee/WxServiceFeeService.java | 2 +- .../main/resources/mapper/WxCouponMapper.xml | 2 +- .../mapper/WxMallNoticeContactMapper.xml | 65 +++++++++++++++++++ .../resources/mapper/WxMallVersionMapper.xml | 2 +- 12 files changed, 172 insertions(+), 10 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxMallNoticeContact.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxMallNoticeContactMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxMallNoticeContactMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index d1956a918..b02c8bbf1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -2,10 +2,13 @@ package com.iformall.controller.basic; import com.google.code.kaptcha.Constants; import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.TtMallIm; import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxMallNoticeContact; import com.iformall.enums.EnumGroupSupport; import com.iformall.service.WxMallService; import com.iformall.utils.ShiroUtils; @@ -97,4 +100,24 @@ public class WxMallController extends BaseController { } + @ApiOperation("根据id查询") + @GetMapping("/noticeContact") + @SystemControllerLog(description = "商城-查询通知配置") + public ResultData noticeContact() { + logger.debug("[" + getIpAddr() + "] WxMallController::noticeContact"); + WxMallNoticeContact noticeContact = wxMallService.getNoticeContact(getTenantInfo()); + return new ResultData(noticeContact); + } + + @ApiOperation("更新接口") + @PostMapping("saveNoticeContact") + @SystemControllerLog(description = "更新") + public ResultData saveNoticeContact(@RequestBody WxMallNoticeContact record) { + logger.debug("[" + getIpAddr() + "] WxMallController::saveNoticeContact"); + record.updateTenantInfo(getTenantInfo()); + wxMallService.saveNoticeContact(record); + return new ResultData(record); + } + + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 00517276e..51d27c4c9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -154,7 +154,7 @@ public class WxCoupon extends TenantEntity { private Integer inventory; @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") private String remark; - @io.swagger.annotations.ApiModelProperty(value="EnumCouponStatus 状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status") + @io.swagger.annotations.ApiModelProperty(value="EnumCouponStatus ",name="status") private Integer status; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallNoticeContact.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallNoticeContact.java new file mode 100644 index 000000000..e405a6fbf --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallNoticeContact.java @@ -0,0 +1,31 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@JsonIgnoreProperties(value = {"handler"}) +@TableName(value = "wx_mall_notice_contact") +@Data +@EqualsAndHashCode(callSuper = true) +public class WxMallNoticeContact extends TenantEntity { + + @TableId(type= IdType.AUTO) + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="",name="phone") + private String phone; + + @io.swagger.annotations.ApiModelProperty(value="通知开关",name="phoneEnabled") + private Integer phoneEnabled; + + @io.swagger.annotations.ApiModelProperty(value="",name="email") + private String email; + + @io.swagger.annotations.ApiModelProperty(value="抖音应用版本EnumDouyinApplicationVersion",name="douyinApplictionVersion") + private Integer emailEnabled; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallNoticeContactMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallNoticeContactMapper.java new file mode 100644 index 000000000..64e824370 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallNoticeContactMapper.java @@ -0,0 +1,17 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxMallNoticeContact; +import com.iformall.domain.po.WxMallVersion; +import com.iformall.domain.po.base.TenantEntity; + +import java.util.List; + +public interface WxMallNoticeContactMapper extends CommonMapper { + + List findList(WxMallNoticeContact wxMall); + + WxMallNoticeContact getByTenantId(String tenantId); + + WxMallNoticeContact getByTenantInfo(TenantEntity tenantEntity); +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java index 1fad1285d..121f84a68 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxMallNoticeContact; import com.iformall.domain.po.WxProjectConfig; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMall; @@ -102,4 +103,9 @@ public interface WxMallService { EnumDouyinApplicationVersion getDouyinApplicationVersion(TenantEntity tenantEntity); WxMall getRandomMall(String randmKey, String tenantId); + + WxMallNoticeContact getNoticeContact(TenantEntity tenantInfo); + + void saveNoticeContact(WxMallNoticeContact record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 8b958062b..29d4d7066 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -10,10 +10,7 @@ import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; import com.iformall.exception.MallinkException; -import com.iformall.mapper.WxMallBuildingMapper; -import com.iformall.mapper.WxMallFloorMapper; -import com.iformall.mapper.WxMallMapper; -import com.iformall.mapper.WxMallVersionMapper; +import com.iformall.mapper.*; import com.iformall.service.MallUserInfoService; import com.iformall.service.WxMallService; import com.iformall.utils.Constant; @@ -63,6 +60,9 @@ public class WxMallServiceImpl implements WxMallService { @Autowired WxMallVersionMapper wxMallVersionMapper; + @Autowired + WxMallNoticeContactMapper wxMallNoticeContactMapper; + @Override @@ -459,4 +459,24 @@ public class WxMallServiceImpl implements WxMallService { return mall; } + @Override + public WxMallNoticeContact getNoticeContact(TenantEntity tenantInfo) { + return wxMallNoticeContactMapper.getByTenantInfo(tenantInfo); + } + + @Override + public void saveNoticeContact(WxMallNoticeContact record) { + if(record.getId() == null){ + WxMallNoticeContact byTenantInfo = wxMallNoticeContactMapper.getByTenantInfo(record); + if(byTenantInfo != null){ + record.setId(byTenantInfo.getId()); + } + } + if(record.getId() == null){ + wxMallNoticeContactMapper.insert(record); + }else{ + wxMallNoticeContactMapper.updateById(record); + } + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java index 41fb447c8..e7ff19643 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java +++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java @@ -75,7 +75,7 @@ public class WxComposeChildOrderShare { private Long merchantId;//收款商户 private String merchantUid;//收款商户 - public void setServiceAmount(Integer serviceAmount){ + public void handleServiceAmount(Integer serviceAmount){ if(this.realPayMent == null){ return; } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java index 5f3eaa21c..b2ea6e5dd 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java @@ -145,7 +145,7 @@ public class TtServiceFeeService implements ServiceFeeAdapterService{ //商品设置的总分佣率 int allCommission = getAllCommission(payAccount,wxComposeChildOrderShare.getOrderId()); int serviceAmount = PayUtils.getPayRate(wxComposeChildOrderShare.getRealPayMent(), allCommission, true); - wxComposeChildOrderShare.setServiceAmount(serviceAmount); + wxComposeChildOrderShare.handleServiceAmount(serviceAmount); return true; } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/WxServiceFeeService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/WxServiceFeeService.java index 625a7ea1a..ef631162c 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/WxServiceFeeService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/WxServiceFeeService.java @@ -91,7 +91,7 @@ public class WxServiceFeeService implements ServiceFeeAdapterService{ //商品设置的总分佣率 int allCommission = getAllCommission(payAccount,wxComposeChildOrderShare.getOrderId()); int serviceAmount = PayUtils.getPayRate(wxComposeChildOrderShare.getRealPayMent(), allCommission, true); - wxComposeChildOrderShare.setServiceAmount(serviceAmount); + wxComposeChildOrderShare.handleServiceAmount(serviceAmount); return true; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 017cbedf2..c09158f9b 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -470,7 +470,7 @@ + select + + from wx_mall_notice_contact + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxMallVersionMapper.xml b/mallinkService/src/main/resources/mapper/WxMallVersionMapper.xml index ce11f7e80..ce59ff6f4 100644 --- a/mallinkService/src/main/resources/mapper/WxMallVersionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallVersionMapper.xml @@ -20,7 +20,7 @@ - and + and `tenant_id` = #{tenantId} and `parent_tenant_id` = #{parentTenantId}