From 9a23c6442a871142b1fd23b5c4904e3ae0e51e0f Mon Sep 17 00:00:00 2001 From: "1215525055@qq.com" <1215525055@qq.com> Date: Mon, 9 Jun 2025 10:34:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../route/goodslog/GoodslogRouteController.java | 8 +++++++- .../aishop/pojo/dtos/goods/GoodsSimpleDTO.java | 10 ++++++++++ .../aishop/pojo/dtos/goodslog/GoodslogDTO.java | 10 ++++++++++ .../service/order/impl/OrderServiceImpl.java | 17 ++++++++--------- .../mybatis/mapper/goodslog/goodslog-mapper.xml | 8 +++++++- .../mapper/goodsonline/goodsonline-mapper.xml | 4 ++++ src/main/resources/templates/goodslog/list.html | 11 ++++++++--- 7 files changed, 54 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/com/tenlion/aishop/controller/route/goodslog/GoodslogRouteController.java b/src/main/java/cn/com/tenlion/aishop/controller/route/goodslog/GoodslogRouteController.java index ac306ca..a24cda2 100644 --- a/src/main/java/cn/com/tenlion/aishop/controller/route/goodslog/GoodslogRouteController.java +++ b/src/main/java/cn/com/tenlion/aishop/controller/route/goodslog/GoodslogRouteController.java @@ -1,5 +1,6 @@ package cn.com.tenlion.aishop.controller.route.goodslog; +import cn.com.tenlion.aishop.properties.SystemApiPathProperties; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; import cn.com.tenlion.aishop.service.goodslog.IGoodslogService; @@ -24,6 +25,9 @@ import java.util.Map; @RequestMapping(ISystemConstant.ROUTE_PREFIX + "/goodslog") public class GoodslogRouteController extends DefaultBaseController { + @Autowired + private SystemApiPathProperties systemApiPathProperties; + @GetMapping("save") public ModelAndView save() { return new ModelAndView("goodslog/save"); @@ -36,7 +40,9 @@ public class GoodslogRouteController extends DefaultBaseController { @GetMapping("list") public ModelAndView list() { - return new ModelAndView("goodslog/list"); + ModelAndView mv = new ModelAndView("goodslog/list"); + mv.addObject("pluginUrl", systemApiPathProperties.getOperatorPlugin()); + return mv; } } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsSimpleDTO.java b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsSimpleDTO.java index 3ff9ef4..da76524 100644 --- a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsSimpleDTO.java +++ b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsSimpleDTO.java @@ -42,6 +42,8 @@ public class GoodsSimpleDTO { private String goodsType; @ApiModelProperty(name = "goodsTypeName", value = "软著平台类型名称") private String goodsTypeName; + @ApiModelProperty(name = "goodsLeaderPhone", value = "著作权人手机号") + private String goodsLeaderPhone; @ApiModelProperty(name = "goodsOpenPrice", value = "软著挂牌价格") private Double goodsOpenPrice; @ApiModelProperty(name = "goodsPrice", value = "软著出售价格") @@ -57,6 +59,14 @@ public class GoodsSimpleDTO { @ApiModelProperty(name = "goodsFlag", value = "商品标签") private String goodsFlag; + public String getGoodsLeaderPhone() { + return goodsLeaderPhone == null ? "" : goodsLeaderPhone.trim(); + } + + public void setGoodsLeaderPhone(String goodsLeaderPhone) { + this.goodsLeaderPhone = goodsLeaderPhone; + } + public String getGoodsTypeName() { return goodsTypeName == null ? "" : goodsTypeName.trim(); } diff --git a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goodslog/GoodslogDTO.java b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goodslog/GoodslogDTO.java index 95448cd..251822b 100644 --- a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goodslog/GoodslogDTO.java +++ b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goodslog/GoodslogDTO.java @@ -30,9 +30,19 @@ public class GoodslogDTO { private String goodsId; @ApiModelProperty(name = "creator", value = "") private String creator; + @ApiModelProperty(name = "creatorName", value = "") + private String creatorName; @ApiModelProperty(name = "gmtCreate", value = "") private String gmtCreate; + public String getCreatorName() { + return creatorName == null ? "" : creatorName.trim(); + } + + public void setCreatorName(String creatorName) { + this.creatorName = creatorName; + } + public String getGoodslogId() { return goodslogId == null ? "" : goodslogId.trim(); } diff --git a/src/main/java/cn/com/tenlion/aishop/service/order/impl/OrderServiceImpl.java b/src/main/java/cn/com/tenlion/aishop/service/order/impl/OrderServiceImpl.java index 8990d2a..8e0aa2f 100644 --- a/src/main/java/cn/com/tenlion/aishop/service/order/impl/OrderServiceImpl.java +++ b/src/main/java/cn/com/tenlion/aishop/service/order/impl/OrderServiceImpl.java @@ -156,15 +156,6 @@ public class OrderServiceImpl extends DefaultBaseService implements IOrderServic iGoodslogService.save(goodsLogVO); - JSONArray phoneArray = new JSONArray(); - JSONObject obj = new JSONObject(); - obj.put("phone", goodsDTO.getGoodsLeaderPhone()); - phoneArray.add(obj); - - Map templateParams = new HashMap<>(); - templateParams.put("name", goodsDTO.getGoodsName()); - TenlionSMS.sendMessage(UUIDUtil.getUUID(), "M00014", templateParams, phoneArray); - /* if (systemConfig.getSmsSwitch()) { iSmsService.sendContentDirectlyByPhone(goodsDTO.getGoodsLeaderPhone(), "您的著作权商品(" + goodsDTO.getGoodsName() + " " + goodsDTO.getGoodsVersion() + ") 已被用户下单购买"); @@ -354,6 +345,14 @@ public class OrderServiceImpl extends DefaultBaseService implements IOrderServic payVO.setAccountMoney(PayUtil.buiderMoney(orderDTO.getPayMoney())); payVO.setDescription("购买付款." + simpleDTO.getGoodsName()); remoteService.savePayOut(payVO); + // 发送短信 + JSONArray phoneArray = new JSONArray(); + JSONObject obj = new JSONObject(); + obj.put("phone", simpleDTO.getGoodsLeaderPhone()); + phoneArray.add(obj); + Map templateParams = new HashMap<>(); + templateParams.put("name", simpleDTO.getGoodsName()); + TenlionSMS.sendMessage(UUIDUtil.getUUID(), "M00014", templateParams, phoneArray); } @Override diff --git a/src/main/resources/mybatis/mapper/goodslog/goodslog-mapper.xml b/src/main/resources/mybatis/mapper/goodslog/goodslog-mapper.xml index beb3f33..254c584 100644 --- a/src/main/resources/mybatis/mapper/goodslog/goodslog-mapper.xml +++ b/src/main/resources/mybatis/mapper/goodslog/goodslog-mapper.xml @@ -11,6 +11,7 @@ + @@ -178,9 +179,14 @@ t1.goodslog_time, t1.goods_id, t1.creator, - t1.gmt_create + t1.gmt_create, + t3.user_username AS creator_name FROM shop_goodslog t1 + LEFT JOIN + user t3 + ON + t1.creator = t3.user_id WHERE t1.goods_id = #{goodsId} ORDER BY diff --git a/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml b/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml index d5bccab..ed9e7e0 100644 --- a/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml +++ b/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml @@ -12,6 +12,7 @@ + @@ -133,6 +134,7 @@ t1.goods_version, t1.goods_get_time, t1.goods_develop, + t1.goods_leader_phone, t1.goods_photo, t1.goods_get_type, t1.goods_description, @@ -163,6 +165,7 @@ t1.goods_version, t1.goods_get_time, t1.goods_develop, + t1.goods_leader_phone, t1.goods_photo, t1.goods_get_type, t1.goods_description, @@ -196,6 +199,7 @@ t1.goods_version, t1.goods_get_time, t1.goods_develop, + t1.goods_leader_phone, t1.goods_photo, t1.goods_get_type, t1.goods_description, diff --git a/src/main/resources/templates/goodslog/list.html b/src/main/resources/templates/goodslog/list.html index a72ef47..e58377d 100644 --- a/src/main/resources/templates/goodslog/list.html +++ b/src/main/resources/templates/goodslog/list.html @@ -32,11 +32,13 @@ 审核未通过
审核未通过

-

- {{ data.goodslogTime}} +

+   {{ data.creatorName}} +

+

+   {{ data.goodslogTime}}

- @@ -72,6 +74,9 @@ }, methods: { /* 点击日志内容事件 */ + handleLogContentClick2(data) { + event.stopPropagation(); // 阻止事件冒泡 + }, handleLogContentClick(data) { // 这里可以获取到当前点击的 data 对象 console.log('点击的日志数据:', data);