Merge branch 'developer'

935090232@qq.com

2022-02-24 8c6026959d3006bbf9dce3f3c9311e70a02b80c1

 zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java

@@ -4,7 +4,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.google.gson.Gson;
import com.matrix.component.rabbitmq.RabiitMqTemplate;
import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.core.anotations.RemoveRequestToken;
import com.matrix.core.anotations.SaveRequestToken;
import com.matrix.core.constance.MatrixConstance;
@@ -28,7 +28,7 @@
import com.matrix.system.shopXcx.bean.*;
import com.matrix.system.shopXcx.dao.*;
import com.matrix.system.shopXcx.dto.DiscountExplain;
import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import com.matrix.system.shopXcx.pojo.ShopOrderQueryPOJO;
import com.matrix.system.shopXcx.shopEnum.OrderStatusEnum;
import com.matrix.system.shopXcx.vo.LogisticsImportVo;
@@ -75,17 +75,16 @@
    private SysShopInfoDao sysShopInfoDao;
    @Autowired
    private SysVipInfoService vipInfoService;
    @Autowired
    private RabiitMqTemplate rabiitMqTemplate;

    //记录编辑前的值Before_Edit_Value
    public static final String BEV = "ShopOrder_BEV";

    public static final List<LogisticsImportVo> logisticsImportVoLists = new ArrayList<>();
    @Autowired
    private AsyncMessageManager asyncMessageManager;

    @Value("${evn}")
    private String evn;
    
    @Value("${file_storage_path}")
    private String fileStoragePath;
    /**
     * 导入快递单
     */
@@ -95,7 +94,7 @@
       @RequestParam(value = "file", required = false) MultipartFile file) throws IOException {

        String fileName = file.getOriginalFilename();
        String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
        String dirPath = fileStoragePath;
//        String dirPath = "E:/xcshop";
        File fileDir = new File(dirPath);
        LogUtil.info("#----->{}#", fileDir.exists());
@@ -228,7 +227,8 @@
                            shopOrderDao.updateByMap(modifyMap);

                            //发送创建订单的消息
                            rabiitMqTemplate.sendMsg(MQTaskRouting.ORDER_OUT_SOTORE+evn, orderNo);
                            asyncMessageManager.sendMsg(AsyncMessageRouting.ORDER_OUT_SOTORE ,"orderNo=%s");

                        }
                    }else{
                        if(ObjectUtil.isEmpty(shopOrder)){