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