src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java

@@ -51,7 +51,6 @@
        registry.addMapping("/**")//允许请求路径

                .allowedOrigins("*")//表示允许所有网址发起跨域请求

                .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")//表示允许跨域请求的方法

                .maxAge(3600)//表示在3600秒内不需要再发送预校验请求

                .allowCredentials(true);//允许客户端携带验证信息，即允许携带cookie

                .maxAge(3600);//表示在3600秒内不需要再发送预校验请求

    }

}


 src/main/java/cc/mrbird/febs/mall/quartz/ChatTrc20ChargeOkLinkTask.java

@@ -47,7 +47,7 @@
    private final static long TIME_INTERVAL = 300000*6;


    private final static String TRON_API_KEY = "fq6S2XK5zfNccu6QfGCi";
    private final static String TRON_API_KEY = "X8Np5zbDuhmG6cntbhLu";

    private static Map<String, String> REQUEST_HEADER = new HashMap<>();
    static {

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java

@@ -62,7 +62,7 @@
    private final MallElectronicFenceMapper mallElectronicFenceMapper;
    private final IMallElectronicFenceService iMallElectronicFenceService;
    private final SpringContextHolder springContextHolder;
    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
    private final XcxProperties xcxProperties;

    @Override
    public IPage<AdminMallTeamLeaderVo> getLeaderListInPage(MallTeamLeader mallTeamLeader, QueryRequest request) {

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiChatPayServiceImpl.java

@@ -49,7 +49,7 @@
        mallOrderInfoMapper.update(null,
                Wrappers.lambdaUpdate(MallOrderInfo.class)
                        .set(MallOrderInfo::getPayMethod, OrderConstants.PAY_TYPE_USDT)
                        .set(MallOrderInfo::getTradeHash, null)
                        .set(MallOrderInfo::getTradeHash, amount.toString())
                        .eq(MallOrderInfo::getId, chatOrder.getId())
        );


 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java

@@ -34,22 +34,22 @@
    @Override
    public List<MallGoodsCategoryVo> findAllCategoryList() {
        List<MallGoodsCategoryVo> mallGoodsCategoryVos = this.baseMapper.selectAllCategoryList();
        ArrayList<MallGoodsCategoryVo> objects = new ArrayList<>();
        if(CollUtil.isNotEmpty(mallGoodsCategoryVos)){
            mallGoodsCategoryVos.forEach(item -> {
                Long id = item.getId();
                List<MallGoods> mallGoods = mallGoodsMapper.selectList(
                        new LambdaQueryWrapper<MallGoods>()
                                .select(MallGoods::getId)
                                .eq(MallGoods::getCategoryId, id));
                if(CollUtil.isEmpty(mallGoods)){
                    objects.add(item);
                }
            });
        }
        if(CollUtil.isNotEmpty(objects)){
            mallGoodsCategoryVos.removeAll(objects);
        }
//        ArrayList<MallGoodsCategoryVo> objects = new ArrayList<>();
//        if(CollUtil.isNotEmpty(mallGoodsCategoryVos)){
//            mallGoodsCategoryVos.forEach(item -> {
//                Long id = item.getId();
//                List<MallGoods> mallGoods = mallGoodsMapper.selectList(
//                        new LambdaQueryWrapper<MallGoods>()
//                                .select(MallGoods::getId)
//                                .eq(MallGoods::getCategoryId, id));
//                if(CollUtil.isEmpty(mallGoods)){
//                    objects.add(item);
//                }
//            });
//        }
//        if(CollUtil.isNotEmpty(objects)){
//            mallGoodsCategoryVos.removeAll(objects);
//        }
        return mallGoodsCategoryVos;
    }


 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -302,7 +302,7 @@
    }


    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
    private final XcxProperties xcxProperties;




 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -822,7 +822,7 @@

    @Autowired
    private WeixinServiceUtil weixinServiceUtil;
    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
    private final XcxProperties xcxProperties;

    @Override
    @Transactional

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java

@@ -61,7 +61,7 @@
    private WeixinServiceUtil weixinServiceUtil;
    @Autowired
    private FiuuUtil fiuuUtil;
    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
    private final XcxProperties xcxProperties;
    private final IMallMoneyFlowService mallMoneyFlowService;
    private final IApiMallMemberWalletService memberWalletService;
    private final MallLeaderAchieveMapper mallLeaderAchieveMapper;

 src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java

@@ -4,7 +4,6 @@
import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.dto.RechargeWalletMessageSendDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -81,7 +80,8 @@
    @Autowired
    private WxFaPiaoService wxFaPiaoService;

    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
    @Autowired
    private XcxProperties xcxProperties;
    /**
     * 微信充值回调接口
     */

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

@@ -2,7 +2,6 @@

import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.entity.MallInvoice;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.entity.MallOrderItem;
@@ -60,8 +59,7 @@
    private final MallOrderInfoMapper mallOrderInfoMapper;
    private final MallOrderItemMapper mallOrderItemMapper;
    private final MallInvoiceMapper mallInvoiceMapper;

    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
    private final XcxProperties xcxProperties;

    @Override
    public String createAuthorization(String method, String canonicalUrl, String body, PrivateKey keyPair) throws UnsupportedEncodingException, NoSuchAlgorithmException {

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

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

    private final SpringContextHolder springContextHolder;

    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
    private final XcxProperties xcxProperties;

    @Override
    public BrandWCPayRequestData startRechargeWallet(ApiRechargeWalletDto apiRechargeWalletDto) throws Exception {

 src/main/java/cc/mrbird/febs/pay/util/WeixinServiceUtil.java

@@ -2,13 +2,13 @@

import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.pay.model.*;
import cc.mrbird.febs.pay.service.impl.JsApiPayComService;
import cc.mrbird.febs.pay.service.impl.RefundService;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletRequest;
@@ -21,7 +21,8 @@
@Service(value="weixinServiceUtil")
public class WeixinServiceUtil {

    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
    @Autowired
    private XcxProperties xcxProperties;

    /**
     * 支付"175.9.82.254"

 src/main/resources/application-test.yml

@@ -84,10 +84,15 @@
  gaodeKey: 95ede7157929f5f6b6c758971be924b1
  serviceName: yiyuanshucai

#static:
#  resource:
#    url: https://res.mye2u.com/
#    path: /home/javaweb/resource/

static:
  resource:
    url: https://res.mye2u.com/
    path: /home/javaweb/resource/
    url: http://120.27.238.55:30001/productImg/
    path: /home/javaweb/webresource/ds/productImg/

system:
  job: true

 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html

@@ -789,17 +789,8 @@

        form.on('submit(goods-add-form-submit)', function (data) {
            data.field.goodsType = 1;
            let couponRuleList = couponRule.getValue();
            if (couponRuleList.length > 0) {
                var couponIds = [];
                layui.each(couponRuleList, function (key, item) {
                    couponIds.push(item.id)
                });
                data.field.couponIds=couponIds;
            }
            data.field.addMallGoodsSkuDtos = tableSkuData;
            data.field.categoryId = category.getValue('valueStr');
            data.field.carriageRuleId = carriageRule.getValue('valueStr');
            // let content = layedit.getContent();
            // alert(content);
            // data.field.goodsDetails = content;

 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html

@@ -854,23 +854,8 @@
            arr.push(goodsInfo.categoryId)
            category.setValue(arr);

            var arrCarriageRule = [];
            arrCarriageRule.push(goodsInfo.carriageRuleId)
            carriageRule.setValue(arrCarriageRule);

            couponRule.setValue(goodsInfo.couponIds);

            if (goodsInfo.isNormal == 2) {
                $(".tc-set").show();
            }

            if (goodsInfo.carriageType == 2) {
                $('.carriage-input').hide();
                $('.carriage-rule').show();
            } else {
                $('.carriage-input').show();
                $('.carriage-rule').hide();
                document.getElementById('carriageAmountDefault').value = goodsInfo.carriageAmount;
            }

            if (goodsInfo.isSku == 1) {
@@ -915,20 +900,10 @@
        }

        form.on('submit(goods-update-form-submit)', function (data) {
            let couponRuleList = couponRule.getValue();
            if (couponRuleList.length > 0) {
                var couponIds = [];
                layui.each(couponRuleList, function (key, item) {
                    couponIds.push(item.id)
                });
                data.field.couponIds=couponIds;
            }
            data.field.goodsType=1;
            data.field.mailGoodsSkuDto = tableSkuData;
            data.field.delSkuId=delSku;
            data.field.categoryId = category.getValue('valueStr');
            data.field.carriageRuleId = carriageRule.getValue('valueStr');
            // data.field.goodsDetails = editor.getHtml();
            data.field.goodsDetails = editor.txt.html();
            $.ajax({
                'url': ctx + 'admin/goods/updateMallGoods',