Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-27 ff719d9fbdc1bc590eb062b24f26f8e12cb85fab

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java

@@ -82,7 +82,7 @@
    private String detail;

    @ApiModelProperty("图片路径列表，逗号分隔")
    @NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
    //@NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
    private String photoPathList;

    @ApiModelProperty("当前页数")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Digits;
import javax.validation.constraints.Min;
import java.math.BigDecimal;

@@ -23,5 +24,6 @@

    @ApiModelProperty("规格价格")
    @Min(value = 0,message = "价格最小值为0")
    @Digits(integer = 8, fraction = 2)
    private BigDecimal attrPrice;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Digits;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import java.math.BigDecimal;
@@ -26,6 +27,7 @@

    @ApiModelProperty("商品现价")
    @Min(value = 0,message = "价格最小值为0")
    @Digits(integer = 8, fraction = 2)
    private BigDecimal price;



 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserArchivesVO.java

@@ -16,6 +16,9 @@
    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("真实名字")
    private String name;

    @ApiModelProperty("身份证号")
    private String idCard;

@@ -23,7 +26,7 @@
    @ApiModelProperty("性别 1 男 2 女")
    private Integer sex;

    @ApiModelProperty("生日")
    @ApiModelProperty("出生年月")
    private Date birthday;

    @ApiModelProperty("职业")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java

@@ -55,16 +55,16 @@
                " AND sr.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.orderNo != null  '>" +
                " AND sr.order_no = #{pageComShopOrderSearchDTO.orderNo} " +
                " AND sr.order_no like concat('%', #{pageComShopOrderSearchDTO.orderNo}, '%') " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.userAccount != null  '>" +
                " AND su.phone = #{pageComShopOrderSearchDTO.userAccount} " +
                " AND su.phone like concat('%', #{pageComShopOrderSearchDTO.userAccount}, '%') " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.receiverAccount != null  '>" +
                " AND uad.name like concat('%', #{pageComShopOrderSearchDTO.receiverAccount}, '%')  " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.receiverPhone != null '>" +
                " AND uad.phone = #{pageComShopOrderSearchDTO.receiverPhone} " +
                " AND uad.phone like concat('%',#{pageComShopOrderSearchDTO.receiverPhone}, '%') " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.goodsName != null'>" +
                " AND og.goods_name like concat('%',  #{pageComShopOrderSearchDTO.goodsName}, '%') " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java

@@ -74,4 +74,9 @@
    @Select("delete from sys_role where role_key = #{account}")
    void deleteSysRoleByAccount(@Param("account") String account);

    @Select("select count(user_id) from sys_user where phone=#{phone}")
    int reasonableUserByPhone(@Param("phone") String phone);

    @Select("select count(user_id) from sys_user where account=#{account} and type=5 ")
    int reasonableUserByAccount(@Param("account") String account);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideDO.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.model.dos;

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 io.swagger.annotations.ApiModelProperty;
@@ -42,10 +43,12 @@
    /**
     * 经度
     */
    @TableField("`lon`")
    private String lon;
    /**
     * 纬度
     */
    @TableField("`lat`")
    private String lat;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java

@@ -92,7 +92,7 @@
                }
            });
        }
        return null;
        return R.ok();
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java

@@ -102,7 +102,9 @@

    @Override
    public R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO) {
        Page page = new Page<>(pageComShopGoodsDTO.getPageNum(), pageComShopGoodsDTO.getPageSize());
        long pageNum = pageComShopGoodsDTO.getPageNum()!=null?pageComShopGoodsDTO.getPageNum():1;
        long pageSize = pageComShopGoodsDTO.getPageSize()!=null?pageComShopGoodsDTO.getPageSize():10;
        Page page = new Page<>(pageNum, pageSize);
        IPage<PageShopGoodsVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO);
        if (!comShopStoreVOIPage.getRecords().isEmpty()) {
            comShopStoreVOIPage.getRecords().forEach(shopGoods -> {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java

@@ -15,7 +15,6 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO;
import com.panzhihua.service_community.dao.ComShopGoodsDAO;
import com.panzhihua.common.model.vos.shop.PageShopStoreVO;
import com.panzhihua.service_community.dao.ComShopStoreDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
@@ -162,8 +161,14 @@
        if (oldComShopStoreDO != null) {
            return R.fail("商家账号已注册");
        }
        //TODO 判断用户
        //this.baseMapper.select(storeVO.getPhone());
        int reasonable1 = this.baseMapper.reasonableUserByPhone(storeVO.getPhone());
        int reasonable2 = this.baseMapper.reasonableUserByAccount(storeVO.getStoreAccount());
        if (reasonable1 > 0) {
            return R.fail("手机号:" + storeVO.getPhone() + "在系统用户中已存在");
        }
        if (reasonable2 > 0) {
            return R.fail("账号:" + storeVO.getStoreAccount() + "在系统用户中已存在");
        }
        //新增店铺先判断是否拥有已删除的店铺
        ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopStoreDO>()
                .eq(ComShopStoreDO::getStoreAccount, storeVO.getStoreAccount()).eq(ComShopStoreDO::getDeleteStatus,ComShopStoreDO.deleteStatus.yes));

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java

@@ -83,7 +83,7 @@
    @ApiOperation(value = "添加商品")
    @ShopOperLog(operType = 3)
    @PostMapping("/add")
    public R search(@RequestBody AddShopGoodsVO addShopGoodsVO){
    public R search(@RequestBody @Validated AddShopGoodsVO addShopGoodsVO){
        R<ShopStoreVO> storeInofR = communityService.getUserStoreInfo(getUserId());

        if(R.isOk(storeInofR)) {
@@ -102,7 +102,7 @@
    @ApiOperation(value = "编辑商品")
    @ShopOperLog(operType = 4)
    @PutMapping("/edit/{id}")
    R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) {
    R editShopGoods(@PathVariable("id") Long id,@RequestBody @Validated AddShopGoodsVO addShopGoodsVO) {
        return communityService.editShopGoods(id,addShopGoodsVO);
    }