.

yiqi-admin/src/main/java/com/yiqi/admin/controller/core/ClothPriceController.java

@@ -68,7 +68,7 @@ public class ClothPriceController extends BaseController {
 
     @PreAuthorize("@ss.hasPermi('cloth:price:list')")
     @ApiOperation("获取衣服价格明细")
-    @GetMapping(value = "listByClothId")
+    @GetMapping(value = "/listByClothId")
     public R<List<ClothPriceVO>> listByClothId(@RequestParam @ApiParam("衣服ID") Long clothId, @RequestParam @ApiParam("业务区域ID") Long storeAreaId) throws Exception {
         List<ClothPrice> clothPrices = clothPriceService.list(new QueryWrapper<ClothPrice>().lambda()
                 .eq(ClothPrice::getClothId, clothId).eq(ClothPrice::getStoreAreaId, storeAreaId));
@@ -105,7 +105,7 @@ public class ClothPriceController extends BaseController {
             clothPriceVO.setPriceType(ClothPriceType.cloth_type.getCode());
             for (ClothPrice clothPrice : clothPrices) {
                 if (clothPrice.getPriceType() != null && clothPrice.getPriceType().equals(ClothPriceType.cloth_type.getCode())
-                        && clothPrice.getClothType() != null && clothPrice.getClothType().equals(dictData.getDictValue())) {
+                        && clothPrice.getClothType() != null && clothPrice.getClothType().equals(Integer.parseInt(dictData.getDictValue()))) {
                     clothPriceVO.setPrice(clothPrice.getPrice());
                     break;
                 }
@@ -118,7 +118,7 @@ public class ClothPriceController extends BaseController {
 
     @ApiOperation("设置衣服价格")
     @Transactional(rollbackFor = Exception.class)
-    @PostMapping(value = "setPrice")
+    @PostMapping(value = "/setPrice")
     public R setPrice(@Valid @RequestBody ClothPriceDTO clothPriceDTO) throws Exception {
         clothPriceService.remove(new QueryWrapper<ClothPrice>().lambda()
                 .eq(ClothPrice::getClothId, clothPriceDTO.getClothId())

yiqi-admin/src/main/java/com/yiqi/admin/controller/core/GoodsSkuController.java

@@ -21,6 +21,7 @@ import com.yiqi.order.domain.dto.RetailQueryGoodsDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -101,12 +102,6 @@ public class GoodsSkuController extends BaseController {
     @PutMapping
     @ApiOperation(value = "修改物料明细")
     public AjaxResult edit(@RequestBody GoodsSkuAddVO goodsSkuAddVO) {
-        if(CollUtil.isNotEmpty(goodsSkuAddVO.getSpecVoList()) && goodsSkuAddVO.getSpecVoList().size() == 2){
-            List<String> collect = goodsSkuAddVO.getSpecVoList().stream().map(GoodsSkuSpec::getSpecName).collect(Collectors.toList());
-            if (StrUtil.equals(collect.get(0),collect.get(1))){
-                return error("两个规格名称不能相同");
-            }
-        }
         goodsSkuAddVO.setUpdateById(getUserId());
         goodsSkuAddVO.setUpdateBy(getUsername());
         return toAjax(goodsSkuService.updateGoodsSku(goodsSkuAddVO));
@@ -154,4 +149,16 @@ public class GoodsSkuController extends BaseController {
         return R.ok(list);
     }
 
+    /**
+     * 修改商品SKU状态
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @PreAuthorize("@ss.hasPermi('goods:commonGoods:edit')")
+    @Log(title = "商品管理", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "updateStatus")
+    @ApiOperation(value = "修改商品SKU状态")
+    public AjaxResult updateGoodsSkuStatus(@RequestBody GoodsSkuAddVO goodsSkuAddVO) {
+        return toAjax(goodsSkuService.updateGoodsSkuStatus(goodsSkuAddVO));
+    }
+
 }

yiqi-common/src/main/java/com/yiqi/activity/domain/ActivityApplyOrg.java

@@ -1,5 +1,7 @@
 package com.yiqi.activity.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -25,18 +27,17 @@ public class ActivityApplyOrg extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 活动ID */
     @Excel(name = "活动ID")
     @ApiModelProperty("活动ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long activityId;
 
     /** 组织ID */
     @Excel(name = "组织ID")
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /** 来源类型 */

yiqi-common/src/main/java/com/yiqi/activity/domain/ActivityClothItem.java

@@ -1,6 +1,9 @@
 package com.yiqi.activity.domain;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -26,6 +29,7 @@ public class ActivityClothItem extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 活动ID */

yiqi-common/src/main/java/com/yiqi/activity/domain/ActivityCouponInfo.java

@@ -1,5 +1,7 @@
 package com.yiqi.activity.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -28,6 +30,7 @@ public class ActivityCouponInfo extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty("活动ID")

yiqi-common/src/main/java/com/yiqi/activity/domain/ActivityCouponItem.java

@@ -1,6 +1,9 @@
 package com.yiqi.activity.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -27,6 +30,7 @@ public class ActivityCouponItem extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 活动ID */

yiqi-common/src/main/java/com/yiqi/activity/domain/ActivityDiscountInfo.java

@@ -1,6 +1,9 @@
 package com.yiqi.activity.domain;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -26,6 +29,7 @@ public class ActivityDiscountInfo extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 活动ID */

yiqi-common/src/main/java/com/yiqi/activity/domain/ActivityGroupInfo.java

@@ -1,6 +1,9 @@
 package com.yiqi.activity.domain;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -26,6 +29,7 @@ public class ActivityGroupInfo extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 活动ID */

yiqi-common/src/main/java/com/yiqi/app/domain/AppCouponTypeApplyOrg.java

@@ -1,5 +1,7 @@
 package com.yiqi.app.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -32,6 +34,7 @@ public class AppCouponTypeApplyOrg extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 优惠券类型ID */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothAdjunct.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -24,7 +26,7 @@ public class ClothAdjunct extends BaseEntity
 
     /** ID */
     @ApiModelProperty("ID")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 编号 */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothCustomItem.java

@@ -26,7 +26,6 @@ public class ClothCustomItem extends BaseEntity {
 
     /** 自定义衣物id */
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 衣物名称 */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothFlawTop.java

@@ -25,12 +25,10 @@ public class ClothFlawTop extends BaseEntity {
 
     /** 衣服瑕疵置顶 */
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 瑕疵id */
     @ApiModelProperty("瑕疵id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long flawId;
 
     /** 目标id（工厂或门店） */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothHanger.java

@@ -28,7 +28,6 @@ public class ClothHanger extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/ClothItem.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -25,7 +27,7 @@ public class ClothItem extends BaseEntity {
      * 衣服名称id
      */
     @ApiModelProperty("衣服名称id")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/ClothRewashReason.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -25,7 +27,7 @@ public class ClothRewashReason extends BaseEntity {
      * 主键ID
      */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/ClothRewashReasonType.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -25,7 +27,7 @@ public class ClothRewashReasonType extends BaseEntity {
      * 主键ID
      */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/ClothSpeed.java

@@ -1,6 +1,9 @@
 package com.yiqi.core.domain;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -28,7 +31,7 @@ public class ClothSpeed extends BaseEntity
 
     /** 主键ID */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 洗衣快慢名称 */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothType.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -24,7 +26,7 @@ public class ClothType extends BaseEntity
 
     /** 衣服种类id */
     @ApiModelProperty("衣服种类id")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 衣服种类名称 */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothWashMode.java

@@ -25,7 +25,6 @@ public class ClothWashMode extends BaseEntity {
 
     /** 洗衣方式id */
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 洗衣方式名称 */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothWashModeRelation.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -24,7 +26,7 @@ public class ClothWashModeRelation extends BaseEntity
 
     /** 主键ID */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 洗衣方式ID */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothWashProblem.java

@@ -27,7 +27,6 @@ public class ClothWashProblem extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 内容 */

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsCategory.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -26,7 +28,7 @@ public class GoodsCategory extends BaseEntity {
      * 类型编号
      */
     @ApiModelProperty("类型编号")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsComment.java

@@ -28,7 +28,6 @@ public class GoodsComment extends BaseEntity {
      */
     @ApiModelProperty("编号")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsCommentReply.java

@@ -27,7 +27,6 @@ public class GoodsCommentReply extends BaseEntity
     /** 编号 */
     @ApiModelProperty("编号")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 评论id */

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsInfo.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -28,7 +30,7 @@ public class GoodsInfo extends BaseEntity {
      * 商品编号
      */
     @ApiModelProperty("商品编号")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsSku.java

@@ -1,6 +1,8 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -30,6 +32,7 @@ public class GoodsSku extends BaseEntity {
      * 主键id
      */
     @ApiModelProperty("主键id")
+    @TableId(type = IdType.AUTO)
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsSkuStockRecord.java

@@ -39,7 +39,6 @@ public class GoodsSkuStockRecord extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsStore.java

@@ -28,6 +28,7 @@ public class GoodsStore extends BaseEntity {
      */
     @ApiModelProperty("编号")
     @TableId(type = IdType.AUTO)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/SettlementManageBill.java

@@ -30,7 +30,6 @@ public class SettlementManageBill extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 开始时间 */

yiqi-common/src/main/java/com/yiqi/core/domain/SettlementManageFactory.java

@@ -30,7 +30,6 @@ public class SettlementManageFactory
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 账单ID */

yiqi-common/src/main/java/com/yiqi/core/domain/SettlementManageStore.java

@@ -30,13 +30,11 @@ public class SettlementManageStore
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 账单ID */
     @Excel(name = "账单ID")
     @ApiModelProperty("账单ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long billId;
 
     /** 来源类型 */

yiqi-common/src/main/java/com/yiqi/core/domain/dto/ClothPriceItemDTO.java

@@ -15,7 +15,7 @@ public class ClothPriceItemDTO {
     private Long washModeId;
 
     @ApiModelProperty("衣服类型编号")
-    private String clothType;
+    private Integer clothType;
 
     @ApiModelProperty("价格")
     private BigDecimal price;

yiqi-common/src/main/java/com/yiqi/core/domain/vo/GoodsSkuQueryVO.java

@@ -66,7 +66,12 @@ public class GoodsSkuQueryVO {
     /**
      * 规格值组合
      */
-    private List<String> specs;
+    private String specs;
+
+    /**
+     * 规格列表
+     */
+    private List<String> specValLists;
 
     /**
      * 来源类型

yiqi-common/src/main/java/com/yiqi/core/service/IGoodsSkuService.java

@@ -88,4 +88,11 @@ public interface IGoodsSkuService extends IService<GoodsSku> {
      * @return 结果
      */
     public List<GoodsSkuQueryVO> getGoodsSkuListToGoodsRetail(Long goodsId);
+
+    /**
+     * @desc 修改商品SKU状态
+     * @param goodsSkuAddVO
+     * @return
+     */
+    int updateGoodsSkuStatus(GoodsSkuAddVO goodsSkuAddVO);
 }

yiqi-common/src/main/java/com/yiqi/order/domain/OrderActivity.java

@@ -1,5 +1,7 @@
 package com.yiqi.order.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,6 +32,7 @@ public class OrderActivity extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 活动id */

yiqi-common/src/main/java/com/yiqi/order/domain/OrderRecharge.java

@@ -37,6 +37,7 @@ public class OrderRecharge extends BaseEntity {
      * 主键ID
      */
     @ApiModelProperty("主键ID")
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableId(type = IdType.AUTO)
     private Long id;
 

yiqi-core/src/main/java/com/yiqi/core/mapper/GoodsSkuMapper.java

@@ -33,7 +33,7 @@ public interface GoodsSkuMapper extends BaseMapper<GoodsSku> {
     public List<GoodsSku> selectGoodsSkuList(GoodsSku goodsSku);
 
     /**
-     * 查询物料明细列表
+     * 查询物料明细列表(总部)
      *
      * @param goodsSkuDTO 物料明细对象
      * @return 物料明细集合

yiqi-core/src/main/java/com/yiqi/core/service/impl/GoodsSkuServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yiqi.core.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,6 +11,7 @@ import com.yiqi.common.enums.SourceType;
 import com.yiqi.common.enums.StatusType;
 import com.yiqi.common.utils.DateUtils;
 import com.yiqi.common.utils.SecurityUtils;
+import com.yiqi.common.utils.StringUtils;
 import com.yiqi.core.domain.GoodsInfo;
 import com.yiqi.core.domain.GoodsSku;
 import com.yiqi.core.domain.GoodsSkuSpec;
@@ -143,6 +145,13 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         if (CollUtil.isEmpty(SkuQueryVOS)) {
             return SkuQueryVOS;
         }
+        // 设置规格值
+        SkuQueryVOS.forEach(goodsSku_ -> {
+            //values字符串数组转List
+            if (StringUtils.isNotBlank(goodsSku_.getSpecs())) {
+                goodsSku_.setSpecValLists(JSONUtil.toList(JSONUtil.parseArray(goodsSku_.getSpecs()), String.class));
+            }
+        });
         Set<Long> collect = SkuQueryVOS.stream().map(GoodsSkuQueryVO::getId).collect(Collectors.toSet());
         List<GoodsSkuSpec> skuStoreList = goodsSkuSpecMapper.selectList(
                 new QueryWrapper<GoodsSkuSpec>().lambda()
@@ -254,40 +263,69 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
     @Override
     public int updateGoodsSku(GoodsSkuAddVO goodsSkuAddVO) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        GoodsSku goodsSku = new GoodsSku();
-        BeanUtils.copyProperties(goodsSkuAddVO, goodsSku);
-        goodsSku.setUpdateById(user.getUserId());
-        goodsSku.setUpdateTime(DateUtils.getNowDate());
-        goodsSku.setUpdateBy(user.getUserName());
-        goodsSku.setSourceType("");
-        int i = baseMapper.updateById(goodsSku);
-
-        // 软删除 原来的规格
-        QueryWrapper<GoodsSkuSpec> qw = new QueryWrapper<>();
-        qw.eq("goods_sku_id", goodsSku.getId());
-        goodsSkuSpecMapper.delete(qw);
-        // 新增新的规格
-        this.insertSpecBySku(goodsSkuAddVO, goodsSku);
-
-        // 更新物料门店
-        LambdaQueryWrapper<GoodsSkuStore> query = new QueryWrapper<GoodsSkuStore>().lambda()
-                .eq(GoodsSkuStore::getGoodsSkuId, goodsSku.getId())
-                .eq(GoodsSkuStore::getSourceType, user.getUserType());
-        if ("01".equals(user.getUserType())) {
-            query.eq(GoodsSkuStore::getTargetId, user.getFactoryId());
+        // 总部
+        if (SourceType.MANAGER.getCode().equals(user.getUserType())) {
+            GoodsSku goodsSku = new GoodsSku();
+            goodsSku.setId(goodsSkuAddVO.getId());
+            if (goodsSkuAddVO.getStatus() != null) {
+                goodsSku.setStatus(goodsSkuAddVO.getStatus());
+            }
+            if (goodsSkuAddVO.getSalePrice() != null) {
+                goodsSku.setSalePrice(goodsSkuAddVO.getSalePrice());
+            }
+            if (goodsSkuAddVO.getWholesalePrice() != null) {
+                goodsSku.setWholesalePrice(goodsSkuAddVO.getWholesalePrice());
+            }
+            if (goodsSkuAddVO.getPurchasePrice() != null) {
+                goodsSku.setPurchasePrice(goodsSkuAddVO.getPurchasePrice());
+            }
+            if (goodsSkuAddVO.getStock() != null) {
+                goodsSku.setStock(goodsSkuAddVO.getStock());
+            }
+            goodsSku.buildUpdateData();
+            baseMapper.updateById(goodsSku);
         }
-        if ("02".equals(user.getUserType())) {
-            query.eq(GoodsSkuStore::getTargetId, user.getStoreId());
+        // 工厂
+        if (SourceType.FACTORY.getCode().equals(user.getUserType())) {
+            GoodsSkuStore goodsSkuStore = goodsSkuStoreService.getSkuStoreBySkuIdAndOrgId(goodsSkuAddVO.getId(), SourceType.FACTORY.getCode(), user.getFactoryId());
+            if (goodsSkuAddVO.getStatus() != null) {
+                goodsSkuStore.setStatus(goodsSkuAddVO.getStatus());
+            }
+            if (goodsSkuAddVO.getSalePrice() != null) {
+                goodsSkuStore.setSalePrice(goodsSkuAddVO.getSalePrice());
+            }
+            if (goodsSkuAddVO.getWholesalePrice() != null) {
+                goodsSkuStore.setWholesalePrice(goodsSkuAddVO.getWholesalePrice());
+            }
+            if (goodsSkuAddVO.getPurchasePrice() != null) {
+                goodsSkuStore.setPurchasePrice(goodsSkuAddVO.getPurchasePrice());
+            }
+            if (goodsSkuAddVO.getStock() != null) {
+                goodsSkuStore.setStock(goodsSkuAddVO.getStock());
+            }
+            goodsSkuStoreService.updateById(goodsSkuStore);
         }
-        GoodsSkuStore skuStore = goodsSkuStoreMapper.selectOne(query);
-        skuStore.setSalePrice(goodsSkuAddVO.getSalePrice());
-        skuStore.setPurchasePrice(goodsSkuAddVO.getPurchasePrice());
-        skuStore.setWholesalePrice(goodsSkuAddVO.getWholesalePrice());
-        skuStore.setUpdateById(user.getUserId());
-        skuStore.setUpdateTime(DateUtils.getNowDate());
-        skuStore.setUpdateBy(user.getUserName());
-        goodsSkuStoreMapper.updateById(skuStore);
-        return i;
+        // 门店
+        if (SourceType.STORE.getCode().equals(user.getUserType())) {
+            GoodsSkuStore goodsSkuStore = goodsSkuStoreService.getSkuStoreBySkuIdAndOrgId(goodsSkuAddVO.getId(), SourceType.STORE.getCode(), user.getStoreId());
+            if (goodsSkuAddVO.getStatus() != null) {
+                goodsSkuStore.setStatus(goodsSkuAddVO.getStatus());
+            }
+            if (goodsSkuAddVO.getSalePrice() != null) {
+                goodsSkuStore.setSalePrice(goodsSkuAddVO.getSalePrice());
+            }
+            if (goodsSkuAddVO.getWholesalePrice() != null) {
+                goodsSkuStore.setWholesalePrice(goodsSkuAddVO.getWholesalePrice());
+            }
+            if (goodsSkuAddVO.getPurchasePrice() != null) {
+                goodsSkuStore.setPurchasePrice(goodsSkuAddVO.getPurchasePrice());
+            }
+            if (goodsSkuAddVO.getStock() != null) {
+                goodsSkuStore.setStock(goodsSkuAddVO.getStock());
+            }
+            goodsSkuStoreService.updateById(goodsSkuStore);
+        }
+        return 1;
     }
 
     /**
@@ -412,4 +450,30 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         });
         return SkuQueryVOS;
     }
+
+    @Override
+    public int updateGoodsSkuStatus(GoodsSkuAddVO goodsSkuAddVO) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        // 总部
+        if (SourceType.MANAGER.getCode().equals(user.getUserType())) {
+            GoodsSku goodsSku = new GoodsSku();
+            goodsSku.setId(goodsSkuAddVO.getId());
+            goodsSku.setStatus(goodsSkuAddVO.getStatus());
+            goodsSku.buildUpdateData();
+            baseMapper.updateById(goodsSku);
+        }
+        // 工厂
+        if (SourceType.FACTORY.getCode().equals(user.getUserType())) {
+            GoodsSkuStore goodsSkuStore = goodsSkuStoreService.getSkuStoreBySkuIdAndOrgId(goodsSkuAddVO.getId(), SourceType.FACTORY.getCode(), user.getFactoryId());
+            goodsSkuStore.setStatus(goodsSkuAddVO.getStatus());
+            goodsSkuStoreService.updateById(goodsSkuStore);
+        }
+        // 门店
+        if (SourceType.STORE.getCode().equals(user.getUserType())) {
+            GoodsSkuStore goodsSkuStore = goodsSkuStoreService.getSkuStoreBySkuIdAndOrgId(goodsSkuAddVO.getId(), SourceType.STORE.getCode(), user.getStoreId());
+            goodsSkuStore.setStatus(goodsSkuAddVO.getStatus());
+            goodsSkuStoreService.updateById(goodsSkuStore);
+        }
+        return 1;
+    }
 }

yiqi-core/src/main/resources/mapper/core/GoodsInfoMapper.xml

@@ -67,6 +67,9 @@
             <if test="goodsType != null  and goodsType != ''">
                 and g.goods_type = #{goodsType}
             </if>
+            <if test="brandId != null  and brandId != ''">
+                and g.brand_id = #{brandId}
+            </if>
             <if test="goodsCategoryId != null  and goodsCategoryId != ''">
                 and g.goods_category_id = #{goodsCategoryId}
             </if>

yiqi-core/src/main/resources/mapper/core/GoodsSkuMapper.xml

@@ -24,21 +24,14 @@
     </sql>
 
     <select id="selectGoodsSkuInfoByHq" resultType="com.yiqi.core.domain.vo.GoodsSkuQueryVO">
-        select a.id as id, a.goods_id as goodsId, a.status as status,
-               c.target_id as targetId, c.source_type as sourceType,
-               c.sale_price as salePrice, c.wholesale_price as wholesalePrice,
-               c.purchase_price as purchasePrice, c.stock as stock
+        select a.*
         from goods_sku a
-        left join goods_sku_store c on c.goods_sku_id = a.id and c.source_type = #{sourceType}
             where a.del_flag = 0
             <if test="goodsId != null  and goodsId != ''">
                 and  a.goods_id = #{goodsId}
             </if>
-            <if test="targetId != null  and targetId != ''">
-                and c.target_id = #{targetId}
-            </if>
             <if test="goodsSkuId != null  and goodsSkuId != ''">
-                and c.goods_sku_id = #{goodsSkuId}
+                and a.goods_sku_id = #{goodsSkuId}
             </if>
             <if test="goodsIdList != null">
                 and a.goods_id in
@@ -46,7 +39,6 @@
                     #{goodsIdList}
                 </foreach>
             </if>
-
     </select>
 
     <select id="selectGoodsSkuInfoByFactory" resultType="com.yiqi.core.domain.vo.GoodsSkuQueryVO">