小程序管理后台订单号生成逻辑修改

kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -424,21 +424,19 @@ public class ApiOrderService {
 //        String merchSn = OmsMerchPropertiesBuilder.instance().getMerchSn();
 //        String merchShortName = OmsMerchPropertiesBuilder.instance().getMerchShortName();
         MerchVo merchVo = apiMerchMapper.queryObjectByMerchSn(merchSn);
-        String merchShortName = "";
-        if(merchVo != null){
-            merchShortName = merchVo.getMerchShortName();
-        }
-        String oneMerchName = "";
-        if(!merchShortName.equalsIgnoreCase("ZW")){
-            oneMerchName = "ZW";
-        }
+//        String merchShortName = "";
+//        if(merchVo != null){
+//            merchShortName = merchVo.getMerchShortName();
+//        }
         String thirdMerchSn = "";
         StoreVo storeVo = apiStoreMapper.queryObject(storeId);
         if(storeVo != null){
             thirdMerchSn = storeVo.getThirdPartyMerchCode()==null?"":storeVo.getThirdPartyMerchCode();
         }
-        //一级商户 + 二级商户（拼音首字母）+ 三级商户 + 业务类型 + 编号
-        String orderSn = oneMerchName + merchShortName + thirdMerchSn + bizType + CommonUtil.generateOrderNumber();
+//        //一级商户 + 二级商户（拼音首字母）+ 三级商户 + 业务类型 + 编号
+//        String orderSn = oneMerchName + merchShortName + thirdMerchSn + bizType + CommonUtil.generateOrderNumber();
+        //一级商户 + 三级商户(拼音首字母) + 业务类型 + 编号
+        String orderSn = "ZW" + thirdMerchSn + bizType + CommonUtil.generateOrderNumber();
         orderInfo.setOrder_sn(orderSn);
         orderInfo.setMerchSn(merchSn);