增加活动公告

xiaoyong931011

2023-03-01 c3f2f93821ac8d351fe7c9d1f0f28c39b36cfef1

 src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java

@@ -78,9 +78,9 @@
        BrandWCPayRequestData payData;
        String productNames = "小程序充值";
        MallMember mallMember = mallMemberMapper.selectById(apiRechargeWalletDto.getMemberId());
        String rechargeNo = "CZ_"+MallUtils.getOrderNum();
        String rechargeNo = apiRechargeWalletDto.getRechargeNo();
        Boolean debug = xcxProperties.getDebug();
        String attrStr = "{'rechargeNo':"+rechargeNo+",'memberId':"+mallMember.getId()+"}";
        String attrStr = "{'rechargeNo':"+rechargeNo+",'memberId':"+mallMember.getId()+",'type':"+apiRechargeWalletDto.getType()+"}";
        if (debug) {
            payData = weixinServiceUtil.createRechargeWallet("[测试]" + productNames, rechargeNo,
                    1, mallMember.getOpenId(), attrStr);
@@ -88,13 +88,6 @@
            payData = weixinServiceUtil.createRechargeWallet(productNames, rechargeNo,
                    unit.multiply(money).intValue(),mallMember.getOpenId(), attrStr);
        }
        mallMoneyFlowService.addMoneyFlow(
                mallMember.getId(),
                money,
                MoneyFlowTypeEnum.RECHARGE.getValue(),
                rechargeNo,
                FlowTypeEnum.BALANCE.getValue(),
                "余额充值",1);
        return payData;
    }

@@ -218,10 +211,10 @@
        orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
        orderStateMsgVo.setPage(info.getPage());
        Map<String, WxTemplateData> m = new HashMap<>(4);
        m.put("thing19.DATA", new WxTemplateData(info.getAddressArea()));
        m.put("phone_number18.DATA", new WxTemplateData(info.getLeaderPhone()));
        m.put("thing3.DATA", new WxTemplateData(info.getGoodsName()));
        m.put("thing15.DATA", new WxTemplateData(info.getRemark()));
        m.put("thing19", new WxTemplateData(info.getAddressArea()));
        m.put("phone_number18", new WxTemplateData(info.getLeaderPhone()));
        m.put("thing3", new WxTemplateData(info.getGoodsName()));
        m.put("thing15", new WxTemplateData(info.getRemark()));
        orderStateMsgVo.setData(m);
        String s = JSONUtil.toJsonStr(orderStateMsgVo);
        log.info(s);
@@ -285,15 +278,9 @@
        if(CollUtil.isNotEmpty(wxTemplateList)){
            for(DataDictionaryCustom dic : wxTemplateList){
                HashMap<String, String> objectObjectHashMap = new HashMap<>();
                //充值到账通知
                if("WX_TEMPLATE_ID_TWO".equals(dic.getCode())){
                    objectObjectHashMap.put("WX_TEMPLATE_ID_TWO",dic.getValue());
                }
                //提货通知
                if("WX_TEMPLATE_ID_THREE".equals(dic.getCode())){
                    objectObjectHashMap.put("WX_TEMPLATE_ID_THREE",dic.getValue());
                }
                wxTemplates.add( objectObjectHashMap);
                objectObjectHashMap.put("name",dic.getCode());
                objectObjectHashMap.put("value",dic.getValue());
                wxTemplates.add(objectObjectHashMap);
            }
        }
        return wxTemplates;
@@ -401,9 +388,9 @@
     * @return
     */
    //图片上传路径
    public  static  final String IMG_UPLOAD_PATH="/mnt/sdc/webresource/groupbuy/wxcode";
    public  static  final String IMG_UPLOAD_PATH="/mnt/sdc/webresource/qianayi/wxcode";
    public  String generateAcode(String scene,String path,String imgName,String width, Integer type){
        String urlPrefix="https://hwfile.csxuncong.com/groupbuy/wxcode";
        String urlPrefix="https://hwfile.csxuncong.com/qianayi/wxcode";
        String imgPath=IMG_UPLOAD_PATH+imgName;
        if(!FileUtil.exist(imgPath)){