Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-06-25 d10ebec3da961f2cff0d96c5e7da4c43f2444e74

Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsController.java

@@ -1,5 +1,6 @@
package com.xzx.gc.shop.controller;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.xzx.gc.common.constant.CommonEnum;
@@ -23,6 +24,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
import java.util.Map;

@RestController
@@ -53,7 +55,10 @@
    @PostMapping(Constants.ADMIN_VIEW_PREFIX+"/score/goods/addGoods.json")
    @ApiOperation(value = "商品管理-添加商品", notes = "test: 仅0有正确返回")
    public JsonResult<String> addGoods(@RequestBody AddGoodsDto model, HttpServletRequest request) {

        List<ScoreGoodsStyleDto> scoreGoodsStyles = model.getScoreGoodsStyles();
        if(CollUtil.isNotEmpty(scoreGoodsStyles)){
            return JsonResult.failMessage("样式不能为空！");
        }
        model.setCreatedBy(getAdminName(request));
        model.setCreatedTime(new Date());
        Long scoreGoodsId = goodsService.addGoods(model);
@@ -121,6 +126,10 @@
        if(ScoreGoods.ISSALE_YES == isSale){
            return JsonResult.failMessage("请先下架商品！");
        }
        List<ScoreGoodsStyleDto> scoreGoodsStyles = model.getScoreGoodsStyles();
        if(CollUtil.isNotEmpty(scoreGoodsStyles)){
            return JsonResult.failMessage("样式不能为空！");
        }
        goodsService.updateGoods(model);
        OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("商品管理-更新商品-" + id).build();

 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java

@@ -42,7 +42,7 @@
    }

    /**
     * 查看商品详情
     * 查看订单详情
     */
    @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/jhy/viewJhyOrder.json")
    @ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewJhyOrderVo.class)})

 gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java

@@ -70,7 +70,7 @@
    @ApiModelProperty(value="主图")
    private List<String> goodsImages;

    @ApiModelProperty(value="积分商品样式")
    @ApiModelProperty(value="积分商品样式",required=true)
    private List<ScoreGoodsStyleDto> scoreGoodsStyles;

    @ApiModelProperty(value="创建人")

 gc-shop/src/main/java/com/xzx/gc/shop/dto/UpdateGoodsDto.java

@@ -67,7 +67,7 @@
    @ApiModelProperty(value="积分商品轮播图")
    private List<String> goodsImages;

    @ApiModelProperty(value="积分商品样式")
    @ApiModelProperty(value="积分商品样式",required=true)
    private List<ScoreGoodsStyleDto> scoreGoodsStyles;

//    @ApiModelProperty(value="创建人")

 gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java

@@ -251,7 +251,7 @@
                if(CollUtil.isNotEmpty(scoreGoodsSkuDtos)){
                    for(ScoreGoodsSkuDto scoreGoodsSkuDto : scoreGoodsSkuDtos){
                        ScoreGoodsSku scoreGoodsSku = objectMapper.convertValue(scoreGoodsSkuDto, ScoreGoodsSku.class);
                        scoreGoodsSku.setGoodsId(scoreGoodsStyleDto.getId());
                        scoreGoodsSku.setGoodsId(scoreGoods.getId());
                        scoreGoodsSku.setStyleId(scoreGoodsStyle.getId());
                        scoreGoodsSkuMapper.insertSelective(scoreGoodsSku);
                    }

 gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml

@@ -10,7 +10,7 @@
        xzx_score_goods a
        WHERE 1 = 1
        <if test="name != null and name != ''">
            and a.name like concat('%',#{name},'%')
            and (a.name like concat('%',#{name},'%') or a.goods_no like concat('%',#{name},'%'))
        </if>
<!--        <if test="delFlag == 0 or delFlag == 1">-->
<!--            and a.del_flag = #{delFlag}-->