Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-28 9109a60d73507e411020c32c8f66fb5ba6fef80c

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java

@@ -414,7 +414,10 @@
    @PostMapping("pageRefundOrder")
    @ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
    public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
        if (null == pageComOrderRefundDTO.getStoreId()){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (null != loginUserInfo.getBackstageType() && 5 == loginUserInfo.getBackstageType()){
            pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
        }else {
            pageComOrderRefundDTO.setUserId(this.getUserId());
        }
        return communityService.pageRefundOrder(pageComOrderRefundDTO);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java

@@ -69,4 +69,7 @@

    @ApiModelProperty(value = "更新人", hidden = true)
    private Long updatedBy;

    @ApiModelProperty(value = "提货点详细地址")
    private String detailAddress;
}

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

@@ -44,9 +44,9 @@
    private Date evaluateTime;

    /**
     * 评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)
     * 评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)
     */
    @ApiModelProperty(value = "评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)")
    @ApiModelProperty(value = "评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)")
    private Integer evaluateType;

    /**

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

@@ -27,6 +27,6 @@
    @ApiModelProperty(value = "订单id")
    private Long orderId;

    @ApiModelProperty(value = "评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)")
    @ApiModelProperty(value = "评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)")
    private Integer evaluateType;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -267,4 +267,7 @@

    @ApiModelProperty("默认地址")
    private ComShopUserAddressVO comShopUserAddressVO;

    @ApiModelProperty("商家id")
    private Long storeIdId;
}

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

@@ -104,4 +104,7 @@
     */
    @ApiModelProperty(value = "配送商品数量")
    private Integer deliveryGoodsNum;

    @ApiModelProperty(value = "提货点详细地址")
    private String detailAddress;
}

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

@@ -93,7 +93,7 @@
    private Integer accountStatus;

    @ApiModelProperty("所属社区id")
    private Long communityId;
    private String communityId;

    @ApiModelProperty("所属社区名称")
    private String communityName;
@@ -102,7 +102,7 @@
    private String serviceScope;

    @ApiModelProperty("服务类型id列表")
    private List<Long> serviceIds;
    private List<String> serviceIds;

    @ApiModelProperty("该商家存有商品，最多返回两条")
    private List<ConvenientProductVO> productVOList;

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.shop;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -46,12 +47,13 @@
     * 评价时间
     */
    @ApiModelProperty("评价时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date evaluateTime;

    /**
     * 评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)
     * 评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)
     */
    @ApiModelProperty("评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)")
    @ApiModelProperty("评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)")
    private Integer evaluateType;

    /**

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

@@ -148,4 +148,10 @@
     */
    @ApiModelProperty("商品名称")
    private String goodsName;

    /**
     * 商品规格名称
     */
    @ApiModelProperty("商品规格名称")
    private String goodsAttrName;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java

@@ -683,6 +683,138 @@
            log.error(e.getMessage());
        }
    }

    /**
     * 推送 商家开始配送后 订单配送通知
     * @param openId    用户openid
     * @param accessToken   token会话标识
     */
    public static void sendStartShipping(String openId, String accessToken, String orderNo){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id("ezwzGs3R5DMuKxTyW8xOIQOIsLpW2sS61ZXsfyll7rw");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("character_string2", orderNo));
        paras.add(new TemplateParam("phrase5", "配送中"));
        paras.add(new TemplateParam("thing8","您的订单已开始配送"));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
        }catch (Exception e){
            log.error("商家开始配送后订阅消息推送失败，失败原因：" + e.getMessage());
        }
    }

    /**
     * 推送 商家送达后 用取货通知
     * @param openId    用户openid
     * @param accessToken   token会话标识
     */
    public static void sendService(String openId, String accessToken, String pointName){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id("6RGbNmRrmGNWyeK7UDodYTItNqEnIIdtlgyzeGLI2w8");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("phrase3", "待收货"));
        paras.add(new TemplateParam("thing7", "您有一个订单已到达自提点，请及时取货"));
        paras.add(new TemplateParam("thing5",pointName));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
        }catch (Exception e){
            log.error("取货通知订阅消息推送失败，失败原因：" + e.getMessage());
        }
    }
    /**
     * 推送 商家发货后 发货通知
     * @param openId    用户openid
     * @param accessToken   token会话标识
     */
    public static void sendDeliverGoodsNotice(String openId, String accessToken, String logisticsCompany , String logisticsNo, String orderNo,String deliverTime){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id("PuE0cYU9xUW7Y6XpW-wqz4Hlj1w2mnI_LprsUByJnGg");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing2", "您有一个订单已发货"));
        paras.add(new TemplateParam("thing3", logisticsCompany));
        paras.add(new TemplateParam("character_string4",logisticsNo));
        paras.add(new TemplateParam("time6",deliverTime));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
        }catch (Exception e){
            log.error("商家发货后订阅消息推送失败，失败原因：" + e.getMessage());
        }
    }

    /**
     * 推送 商家处理完退款申请后 订单退款通知
     * @param openId    用户openid
     * @param accessToken   token会话标识
     */
    public static void sendRefundNotice(String openId, String accessToken, String refundNo , String refundAmount, String result){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id("GxFV_Oj1Pri4NnPkvKGPIPJsPryG8M6DW9mTHTbIrjE");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("character_string6", refundNo));
        paras.add(new TemplateParam("amount9", refundAmount));
        paras.add(new TemplateParam("phrase11",result));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
        }catch (Exception e){
            log.error("订单退款通知 订阅消息推送失败，失败原因：" + e.getMessage());
        }
    }

    /**
     * 推送 新订单提醒 商家收到一个新的订单
     * @param openId    用户openid
     * @param accessToken   token会话标识
     */
    public static void sendNewOrderNotice(String openId, String accessToken, String orderNo , String type, String goodsName,String amount,String orderTime){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id("3EwAKLw2Xe2o-GDnH-NUGa4nNwqPXsn01hBX8Xp2PbU");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("character_string1", orderNo));
        paras.add(new TemplateParam("thing5", type));
        paras.add(new TemplateParam("thing3",goodsName));
        paras.add(new TemplateParam("amount4",amount));
        paras.add(new TemplateParam("time2",orderTime));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
        }catch (Exception e){
            log.error("新订单提醒 订阅消息推送失败，失败原因：" + e.getMessage());
        }
    }

    /**
     * 推送 退款申请通知 商家收到一个退款申请
     * @param openId    用户openid
     * @param accessToken   token会话标识
     */
    public static void sendNewRefundOrderNotice(String openId, String accessToken, String refundNo , String refundAmount,String orderTime){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id("3EwAKLw2Xe2o-GDnH-NUGa4nNwqPXsn01hBX8Xp2PbU");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing5", "您有一个退款订单"));
        paras.add(new TemplateParam("character_string2", refundNo));
        paras.add(new TemplateParam("amount3",refundAmount));
        paras.add(new TemplateParam("time4",orderTime));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
        }catch (Exception e){
            log.error("退款申请通知 订阅消息推送失败，失败原因：" + e.getMessage());
        }
    }



    public static void main(String[] args) {

        WxXCXTempSend util = new WxXCXTempSend();

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

@@ -59,7 +59,7 @@
     * @param merchantId
     * @return serviceIds
     */
    List<Long> selectServiceIdsForMerchant(@Param("merchantId") Long merchantId);
    List<String> selectServiceIdsForMerchant(@Param("merchantId") Long merchantId);

    /**
     * 查看服务分类是否被引用

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

@@ -48,7 +48,7 @@
    private Date evaluateTime;

    /**
     * 评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)
     * 评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)
     */
    @TableField(value = "evaluate_type")
    private Integer evaluateType;

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

@@ -38,6 +38,11 @@
     * 提货点地址
     */
    private String address;

    /**
     * 提货点地址详细地址
     */
    private String detailAddress;
    /**
     * 联系人
     */

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

@@ -243,6 +243,7 @@
                ComShopFlowerOrderGoodsDO orderGoodsDO = new ComShopFlowerOrderGoodsDO();
                orderGoodsDO.setGoodsId(goodsDO.getId());
                orderGoodsDO.setGoodsName(goodsDO.getName());

                orderGoodsDO.setStoreId(storeId);
                orderGoodsDO.setUserId(userId);
                orderGoodsDO.setAmount(createGoodsDTO.getNum());
@@ -258,6 +259,7 @@
                if (goodsAttrDO.getStock() < createGoodsDTO.getNum()) {
                    return R.fail("该规格库存不足，无法下单");
                }
                orderGoodsDO.setGoodsAttrName(goodsAttrDO.getGoodsAttrName());
                orderGoodsDO.setGoodsAttrId(goodsAttrDO.getId());
                orderGoodsDO.setGoodsAttrPrice(createGoodsDTO.getPrice());
                orderGoodsDO.setPrice(goodsAttrDO.getPrice());
@@ -932,6 +934,7 @@
                    ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
                    BeanUtils.copyProperties(convenientElevatingPointDO, convenientElevatingPointVO);
                    orderVo.setConvenientElevatingPointVO(convenientElevatingPointVO);

                }
            });
        }

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

@@ -105,6 +105,7 @@
                    orderGoodsVOS.add(orderGoodsVO);
                    sbr.append(orderGoods.getGoodsName()).append(" ");
                });
                comShopFlowerRefundOrderVO.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
            }
            comShopFlowerRefundOrderVO.setOrderGoodsVOList(orderGoodsVOS);
            comShopFlowerRefundOrderVO.setGoodsName(sbr.toString());
@@ -138,7 +139,7 @@
                String refundNo = WXPayUtil.generateNonceStr();
                ComShopFlowerOrderDO comShopFlowerOrderDO = comShopFlowerOrderDAO.selectById(comShopFlowerRefundOrderDO.getOrderId());
                String refundStr = WxPayUtils.refund(appid, mchId, comShopFlowerOrderDO.getOrderNo(), comShopFlowerRefundOrderDO.getPayAmount(),
                        comShopFlowerRefundOrderDO.getRefundAmount(), refundNo, isTest);
                        comShopFlowerRefundOrderDO.getPayAmount(), refundNo, isTest);
                log.info("退款请求接口返回参数:{}" , refundStr);
                Map<String, String> mapResult  = WXPayUtil.xmlToMap(refundStr);
                if (CollUtil.isNotEmpty(mapResult)) {
@@ -261,6 +262,7 @@
                if (goodsAttrDO != null) {
                    orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttrName());
                }
                comShopFlowerRefundOrderVO.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
                orderGoodsVOS.add(orderGoodsVO);
                sbr.append(orderGoods.getGoodsName()).append(" ");
            });

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

@@ -190,7 +190,7 @@
    @Override
    public R getMerchant(Long merchantId) {
        ConvenientMerchantVO convenientMerchantVO = this.baseMapper.selectMerchantById(merchantId);
        List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
        List<String> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
        convenientMerchantVO.setServiceIds(serviceIds);
        return R.ok(convenientMerchantVO);
    }
@@ -272,7 +272,7 @@
        Long merchantId = merchantDO.getId();
        ConvenientMerchantVO convenientMerchantVO = new ConvenientMerchantVO();
        BeanUtils.copyProperties(merchantDO, convenientMerchantVO);
        List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
        List<String> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
        convenientMerchantVO.setServiceIds(serviceIds);
        Date nowDate = new Date();
        SimpleDateFormat mothFormat = new SimpleDateFormat("yyyy-MM");
@@ -484,7 +484,7 @@
            return R.fail("商家不存在");
        }
        Long merchantId = convenientMerchantVO.getId();
        List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
        List<String> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
        convenientMerchantVO.setServiceIds(serviceIds);
        BigDecimal score = comShopFlowerEvaluateDAO.statisticsScore(merchantId);
        convenientMerchantVO.setScore(null == score ? BigDecimal.ZERO : NumberUtil.round(score, 1));

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientServiceCategoryMapper.xml

@@ -42,7 +42,7 @@
    <select id="selectServiceScopeByMerchantId" resultType="java.lang.String">
        SELECT GROUP_CONCAT(`service_name`) serviceScope FROM com_convenient_service_scope WHERE merchant_id = #{merchantId}
    </select>
    <select id="selectServiceIdsForMerchant" resultType="java.lang.Long">
    <select id="selectServiceIdsForMerchant" resultType="java.lang.String">
        SELECT service_category_id FROM com_convenient_service_scope WHERE merchant_id = #{merchantId}
    </select>
    <select id="checkCategoryIsUsing" resultType="java.lang.Integer">

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -455,4 +455,6 @@
    int checkPoint(String phone);

    ComShopUserAddressVO selectDefaultAddressVO(@Param("userId") String userId);

    Long selectStoreIdIdByUserId(@Param("userId")  Long userId);
}

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

@@ -548,6 +548,9 @@
        if (nonNull(sysUser)){
            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
            loginUserInfoVO.setBackstageType(5);
            Long storeId = userDao.selectStoreIdIdByUserId(sysUser.getUserId());
            loginUserInfoVO.setStoreIdId(storeId);

        }
        //是否为物业公司账号
        if (nonNull(sysUserDO.getPhone())){

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml

@@ -114,5 +114,8 @@
    <select id="selectDefaultAddressVO" resultType="com.panzhihua.common.model.vos.shop.ComShopUserAddressVO">
        select * from com_shop_flower_user_address where user_id = #{userId} and is_default = 1 and delete_status = 2
    </select>
    <select id="selectStoreIdIdByUserId" resultType="java.lang.Long">
        select id from com_convenient_merchants where user_id  = #{userId} and is_del = 0
    </select>

</mapper>