Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-22 1f9889666aef211599087ce6dcc4cd6cff3496ad

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java

@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.excel.CustomSheetWriteHandler;
import com.panzhihua.common.interfaces.ShopOperLog;
@@ -75,7 +76,7 @@
        return communityService.pageStoreList(pageComShopStoreDTO);
    }

    @ApiOperation(value = "保存商家Bak")
//    @ApiOperation(value = "保存商家Bak")
    @PostMapping("/store/saveBak")
    public R saveStoreBak(@Valid @RequestBody ShopStoreVO storeVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -134,14 +135,15 @@
        return R.ok();
    }

    @ApiOperation(value = "编辑商家、启用、禁用")
    @PostMapping("/store/edit/{id}")
    @ApiImplicitParam(name = "id", value = "商家id")
    public R editStore(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
//    @ApiOperation(value = "编辑商家、启用、禁用")
    @PostMapping("/storebak/edit/{id}")
//    @ApiImplicitParam(name = "id", value = "商家id")
    public R editStoreBak(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
        R<LoginUserInfoVO> sysUserVO = userService.getSysUserVOByAccountAndType(storeVO.getStoreAccount(),5);
        if (sysUserVO.getData() == null) {
            return R.fail("没有相关的用户！");
        }

        LoginUserInfoVO user = JSON.parseObject(JSON.toJSONString(sysUserVO.getData())).toJavaObject(LoginUserInfoVO.class);
        storeVO.setSysUserId(user.getUserId());
        R<ShopStoreVO> storeInfoVO = communityService.getStoreInfo(id);
@@ -159,6 +161,28 @@
            return communityService.editStore(storeVO, id);
        }
        return R.fail();
    }

    @ApiOperation(value = "编辑商家、启用、禁用")
    @PostMapping("/store/edit/{id}")
    @ApiImplicitParam(name = "id", value = "商家id")
    public R editStore(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
        //判断参数
        if(storeVO == null || id == null){
            return R.fail("参数错误");
        }
        storeVO.setId(id);
        //修改店铺信息
        R editStore = communityService.editStore(storeVO, id);
        if(editStore == null || editStore.getCode() != Constants.SUCCESS){
            return editStore;
        }
        //修改SysUser信息
        R editUser = userService.editSysUser(storeVO);
        if(editUser == null || editUser.getCode() != Constants.SUCCESS){
            return editUser;
        }
        return R.ok();
    }

    @ApiOperation(value = "删除商家")
@@ -204,7 +228,7 @@
    @PostMapping("/order/page")
    public R page(@RequestBody @Validated PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
        //pageComShopOrderSearchDTO.setUserId(this.getUserId());
        //ClazzUtils.setIfStringIsEmpty(pageComShopOrderSearchDTO);
        ClazzUtils.setIfStringIsEmpty(pageComShopOrderSearchDTO);
        return communityService.pageShopOrder(pageComShopOrderSearchDTO);
    }

@@ -365,6 +389,8 @@
    @ApiOperation(value = "配送完成")
    @PutMapping("/order/finishDeliver")
    public R finishDeliver(@RequestBody ComShopOrderDeliverDTO deliverDTO){
        deliverDTO.setOperUserAccount(getLoginUserInfo().getPhone());
        deliverDTO.setIsAdmin(true);
        return communityService.finishDeliverOrder(deliverDTO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java

@@ -19,4 +19,8 @@
public class ComShopOrderDeliverDTO {
    @ApiModelProperty(value = "订单ID")
    private Long orderId;
    @ApiModelProperty(value = "操作账号", hidden = true)
    private String operUserAccount;
    @ApiModelProperty(value = "是否是管理员", hidden = true)
    private Boolean isAdmin = false;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java

@@ -20,4 +20,8 @@
    private String logisticsCompany;
    @ApiModelProperty(value = "物流单号")
    private String logisticsNo;
    @ApiModelProperty(value = "操作账号", hidden = true)
    private String operUserAccount;
    @ApiModelProperty(value = "是否是管理员", hidden = true)
    private Boolean isAdmin;
}

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

@@ -74,4 +74,8 @@
    @ApiModelProperty("id")
    private Long id;

    @ApiModelProperty("商家简介")
    @Size(max = 25,min = 1,message = "简介长度不符合！")
    private String storeDescribe;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -653,4 +653,12 @@
     */
    @PostMapping("addSysUser")
    R addSysUser(@RequestBody ShopStoreVO storeVO);

    /**
     * 修改SysUser信息
     * @param storeVO   sysUser信息
     * @return  修改结果
     */
    @PostMapping("editSysUser")
    R editSysUser(@RequestBody ShopStoreVO storeVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java

@@ -444,8 +444,7 @@
     */
    @PostMapping("/deliverOrder")
    R deliverOrder(@RequestBody  ComShopOrderDeliverDTO deliverDTO){
        Long orderId = deliverDTO.getOrderId();
        return comShopOrderService.deliverOrder(orderId);
        return comShopOrderService.deliverOrder(deliverDTO);
    }
    /**
     * 订单配送
@@ -454,8 +453,7 @@
     */
    @PostMapping("/finishDeliverOrder")
    R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
        Long orderId = deliverDTO.getOrderId();
        return comShopOrderService.finishDeliverOrder(orderId);
        return comShopOrderService.finishDeliverOrder(deliverDTO);
    }

    /**

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

@@ -87,7 +87,7 @@
    IPage<ComShopOrderSearchVO> pageOrderBy(Page page, @Param("pageComShopOrderSearchDTO")  PageComShopOrderSearchDTO pageComShopOrderSearchDTO);

    @Select("<script> " +
            "SELECT sr.total_amount AS goods_total, GROUP_CONCAT(og.goods_name) AS goods_name , count(og.id) AS goods_count, " +
            "SELECT sr.total_amount AS goods_total, GROUP_CONCAT(og.goods_name) AS goods_name , sum(og.amount) AS goods_count, " +
                " su.phone AS account, uad.name AS receiver, uad.phone AS receiverPhone, \n" +
                " concat(uad.province_name, uad.city_name, uad.district_name, uad.detail_address) AS receiver_address, ss.name AS storeName, sr.remark," +
                    "  CASE\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java

@@ -94,17 +94,17 @@

    /**
     * 订单配送
     * @param orderId 订单id
     * @param orderDeliverDTO 订单信息
     * @return 配送结果
     */
    R deliverOrder(Long orderId);
    R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);

    /**
     * 订单完成配送
     * @param orderId 订单id
     * @param orderDeliverDTO 订单信息
     * @return 完成配送结果
     */
    R finishDeliverOrder(Long orderId);
    R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);

    /**
     * 获取订单导出数据

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

@@ -574,14 +574,30 @@
        comShopOrderDO.setLogisticsNo(orderShipDTO.getLogisticsNo());
        int updated = comShopOrderDAO.updateById(comShopOrderDO);
        if(updated==1){
            //创建订单操作记录
            ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
            orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
            orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
            orderOperateDO.setOperationTime(new Date());
            if(orderShipDTO.getIsAdmin()){
                orderOperateDO.setOperationContent("已发货");
                orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
            }else {
                orderOperateDO.setOperationContent("已发货");
                orderOperateDO.setOperationBy("用户");
            }
            int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
            if(inserted!=1){
                log.error("订单发货日志保存错误");
            }
            return R.ok("发货成功");
        }
        return R.fail("发货失败!");
    }

    @Override
    public R deliverOrder(Long orderId) {
        ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderId);
    public R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
        ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
        if(comShopOrderDO==null){
            return R.fail("订单不存在");
        }
@@ -598,18 +614,35 @@
        comShopOrderDO.setStatus(3);
        int updated = comShopOrderDAO.updateById(comShopOrderDO);
        if(updated==1){

            //创建订单操作记录
            ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
            orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
            orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
            orderOperateDO.setOperationTime(new Date());
            if(orderDeliverDTO.getIsAdmin()){
                orderOperateDO.setOperationContent("已发货");
                orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
            }else {
                orderOperateDO.setOperationContent("已发货");
                orderOperateDO.setOperationBy("用户");
            }
            int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
            if(inserted!=1){
                log.error("订单发货日志保存错误");
            }
            return R.ok("开始配送");
        }
        return R.fail("操作失败!");
    }

    @Override
    public R finishDeliverOrder(Long orderId) {
        ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderId);
    public R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
        ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
        if(comShopOrderDO==null){
            return R.fail("订单不存在");
        }
        if(!(comShopOrderDO.getDeliveryStatus() == 4)){
        if(comShopOrderDO.getDeliveryStatus() != 4 && comShopOrderDO.getDeliveryStatus() != 3){
            return R.fail("订单还未开始配送");
        }
        if(!(comShopOrderDO.getStatus() == 3)){
@@ -619,6 +652,23 @@
        comShopOrderDO.setDeliveryStatus(5);
        int updated = comShopOrderDAO.updateById(comShopOrderDO);
        if(updated==1){

            //创建订单操作记录
            ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
            orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
            orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.complete);
            orderOperateDO.setOperationTime(new Date());
            if(orderDeliverDTO.getIsAdmin()){
                orderOperateDO.setOperationContent("订单已完成");
                orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
            }else {
                orderOperateDO.setOperationContent("订单已完成");
                orderOperateDO.setOperationBy("用户");
            }
            int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
            if(inserted!=1){
                log.error("订单发货日志保存错误");
            }
            return R.ok("配送完成");
        }
        return R.fail("操作失败!");

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

@@ -162,14 +162,16 @@

    @Override
    public R editStore(Long id, ShopStoreVO storeVO) {
        if (storeVO == null) {
            return R.ok("500", "数据为空！");
        ComShopStoreDO storeDO = this.baseMapper.selectById(id);
        if(storeDO == null){
            return R.fail("商家不存在");
        }
        LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getId, id);
        ComShopStoreDO storeDO = new ComShopStoreDO();
        BeanUtils.copyProperties(storeVO, storeDO);
        int update = this.baseMapper.update(storeDO, query);
        return update > 0 ? R.ok() : R.fail();
        if(this.baseMapper.updateById(storeDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -747,12 +747,22 @@
    }

    /**
     * 通过账号和渠道查询用户信息
     * @param storeVO
     * @return
     * 创建SysUser用户信息以及权限
     * @param storeVO   请求参数
     * @return  创建结果
     */
    @PostMapping("addSysUser")
    public R addSysUser(@RequestBody ShopStoreVO storeVO){
        return userService.addSysUser(storeVO);
    }

    /**
     * 修改SysUser用户信息
     * @param storeVO   请求参数
     * @return  修改结果
     */
    @PostMapping("editSysUser")
    public R editSysUser(@RequestBody ShopStoreVO storeVO){
        return userService.editSysUser(storeVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -371,4 +371,11 @@
     * @return  新增结果
     */
    R addSysUser(ShopStoreVO storeVO);

    /**
     * 修改SysUser用户信息
     * @param storeVO   请求参数
     * @return  修改结果
     */
    R editSysUser(ShopStoreVO storeVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1574,6 +1574,12 @@
        return R.ok(sysUserVO);
    }

    /**
     * 新增SysUser
     * @param storeVO   请求参数
     * @return  新增结果
     */
    @Override
    public R addSysUser(ShopStoreVO storeVO){

        SysUserDO sysUserDO = new SysUserDO();
@@ -1611,7 +1617,6 @@
            return R.fail("角色不存在");
        }
        String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
        storeVO.setStorePassword(encode);
        BeanUtils.copyProperties(storeVO, sysUserDO);
        sysUserDO.setAccount(storeVO.getStoreAccount());
        sysUserDO.setType(5);
@@ -1619,6 +1624,7 @@
        sysUserDO.setStatus(1);
        sysUserDO.setPhone(storeVO.getPhone());
        sysUserDO.setName(storeVO.getContacts());
        sysUserDO.setPassword(encode);
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
@@ -1649,4 +1655,24 @@
        }
        return R.fail();
    }

    /**
     * 修改SysUser用户信息
     * @param storeVO   请求参数
     * @return  修改结果
     */
    @Override
    public R editSysUser(ShopStoreVO storeVO){
        SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,storeVO.getPhone())
                .eq(SysUserDO::getType,5));
        if(sysUserDO1 == null){
            return R.fail("未查询到后台管理用户！");
        }
        String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
        sysUserDO1.setPassword(encode);
        if (userDao.updateById(sysUserDO1) > 0) {
            return R.ok();
        }
        return R.fail("密码修改失败");
    }
}

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

@@ -85,6 +85,8 @@
    @PutMapping("/ship")
    @ShopOperLog(operType = 9)
    public R ship(@RequestBody ComShopOrderShipDTO orderShipDTO){
        orderShipDTO.setOperUserAccount(getLoginUserInfo().getAccount());
        orderShipDTO.setIsAdmin(false);
        return communityService.shipOrder(orderShipDTO);
    }

@@ -92,12 +94,16 @@
    @PutMapping("/startDeliver")
    @ShopOperLog(operType = 10)
    public R deliver(@RequestBody ComShopOrderDeliverDTO deliverDTO){
        deliverDTO.setOperUserAccount(getLoginUserInfo().getAccount());
        deliverDTO.setIsAdmin(false);
        return communityService.deliverOrder(deliverDTO);
    }

    @ApiOperation(value = "配送完成")
    @PutMapping("/finishDeliver")
    public R finishDeliver(@RequestBody ComShopOrderDeliverDTO deliverDTO){
        deliverDTO.setOperUserAccount(getLoginUserInfo().getAccount());
        deliverDTO.setIsAdmin(false);
        return communityService.finishDeliverOrder(deliverDTO);
    }