fix

zhongzheng-admin-store/src/main/java/com/zhongzheng/controller/store/GoodsController.java

@@ -3,8 +3,11 @@ package com.zhongzheng.controller.store;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.domain.model.TopLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.goods.bo.GoodsAddBo;
 import com.zhongzheng.modules.goods.bo.GoodsEditBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
@@ -32,6 +35,8 @@ import java.util.List;
 public class GoodsController extends BaseController {
 
     private final IGoodsService iGoodsService;
+
+    private final TopTokenService tokenService;
     /**
      * 新增题库商品
      */
@@ -51,6 +56,8 @@ public class GoodsController extends BaseController {
     @Log(title = "编辑积分商品", businessType = BusinessType.INSERT)
     @PostMapping("/updatePoints")
     public AjaxResult<Void> updatePoints(@RequestBody GoodsEditBo bo) {
+        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setOperName(loginUser.getUser().getUserName());
         return toAjax(iGoodsService.updatePointsByEditBo(bo) ? 1 : 0);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -241,11 +241,12 @@ public class GoodsEditBo {
     @ApiModelProperty("店铺ID")
     private Long storeId;
     /** 合作商户ID */
-    @ApiModelProperty("合作商户ID")
-    private Long merId;
+/*    @ApiModelProperty("合作商户ID")
+    private Long merId;*/
     /** 关联使用类型 1积分商城 2会员卡 */
     @ApiModelProperty("关联使用类型 1积分商城 2会员卡,多个,拼接")
     private String useType;
     @ApiModelProperty("商品ID")
     private List<Long> goodsIds;
+    private String operName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -69,7 +69,9 @@ import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.system.service.ISysGoodsCopyRecordService;
 import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.top.mall.bo.TopActionLogAddBo;
 import com.zhongzheng.modules.top.mall.domain.TopStore;
+import com.zhongzheng.modules.top.mall.service.ITopActionLogService;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
 import com.zhongzheng.modules.user.bo.UserPhoneBo;
 import com.zhongzheng.modules.user.domain.School;
@@ -267,6 +269,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Autowired
     private IActivityGoodsPriceService iActivityGoodsPriceService;
 
+    @Autowired
+    private ITopActionLogService iTopActionLogService;
+
 
     @Value("${oldStudySys.educationalInspector}")
     private String INFORM_PATH;
@@ -643,6 +648,39 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public Boolean updatePointsByEditBo(GoodsEditBo bo) {
+        Goods oldGoods = getOne(new LambdaQueryWrapper<Goods>()
+                .eq(Goods::getGoodsType,7)
+                .eq(Goods::getGoodsId, bo.getGoodsId()).last("limit 1"));
+        if(oldGoods.getStandPrice().compareTo(bo.getStandPrice())!=0){
+            TopActionLogAddBo addBo = new TopActionLogAddBo();
+            addBo.setLogType(3);
+            addBo.setLogAction(2L);
+            addBo.setMajorId(bo.getGoodsId());
+            addBo.setOldContent("商品原价:"+oldGoods.getStandPrice());
+            addBo.setNewContent("商品原价:"+bo.getStandPrice());
+            addBo.setOperName(bo.getOperName());
+            iTopActionLogService.insertByAddBo(addBo);
+        }
+        if(oldGoods.getSpecialPrice().compareTo(bo.getSpecialPrice())!=0){
+            TopActionLogAddBo addBo = new TopActionLogAddBo();
+            addBo.setLogType(3);
+            addBo.setLogAction(2L);
+            addBo.setMajorId(bo.getGoodsId());
+            addBo.setOldContent("会员优惠价:"+oldGoods.getSpecialPrice());
+            addBo.setNewContent("会员优惠价:"+bo.getSpecialPrice());
+            addBo.setOperName(bo.getOperName());
+            iTopActionLogService.insertByAddBo(addBo);
+        }
+        if(!oldGoods.getGoodsName().equals(bo.getGoodsName())){
+            TopActionLogAddBo addBo = new TopActionLogAddBo();
+            addBo.setLogType(3);
+            addBo.setLogAction(2L);
+            addBo.setMajorId(bo.getGoodsId());
+            addBo.setOldContent("商品名称:"+oldGoods.getGoodsName());
+            addBo.setNewContent("商品名称:"+bo.getGoodsName());
+            addBo.setOperName(bo.getOperName());
+            iTopActionLogService.insertByAddBo(addBo);
+        }
         Goods update = BeanUtil.toBean(bo, Goods.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopActionLogAddBo.java

@@ -45,4 +45,7 @@ public class TopActionLogAddBo {
     /** 操作人员 */
     @ApiModelProperty("操作人员")
     private String operName;
+    /** 主ID（商品ID，用户ID） */
+    @ApiModelProperty("主ID（商品ID，用户ID）")
+    private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopActionLogEditBo.java

@@ -53,4 +53,7 @@ public class TopActionLogEditBo {
     @ApiModelProperty("操作人员")
     private String operName;
 
+    /** 主ID（商品ID，用户ID） */
+    @ApiModelProperty("主ID（商品ID，用户ID）")
+    private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopActionLogQueryBo.java

@@ -57,4 +57,7 @@ public class TopActionLogQueryBo extends BaseEntity {
 	/** 操作人员 */
 	@ApiModelProperty("操作人员")
 	private String operName;
+	/** 主ID（商品ID，用户ID） */
+	@ApiModelProperty("主ID（商品ID，用户ID）")
+	private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/domain/TopActionLog.java

@@ -46,4 +46,6 @@ private static final long serialVersionUID=1L;
     private Long logAction;
     /** 操作人员 */
     private String operName;
+    /** 主ID（商品ID，用户ID） */
+    private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/vo/TopActionLogVo.java

@@ -53,4 +53,8 @@ public class TopActionLogVo {
 	@ApiModelProperty("操作人员")
 	private String operName;
 	private Long createTime;
+	/** 主ID（商品ID，用户ID） */
+	@Excel(name = "主ID" , readConverterExp = "商=品ID，用户ID")
+	@ApiModelProperty("主ID（商品ID，用户ID）")
+	private Long majorId;
 }