#feat 修改bug

yanghui

2022-11-28 ba4f717094e594550bb5aeac85b7fdfdbcf74bf3

#feat 修改bug

 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/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/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/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">