异味修复

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseOrderServiceImpl.java

@@ -542,7 +542,7 @@ public class FsUserCourseOrderServiceImpl implements IFsUserCourseOrderService
 //                        o.setOpenId(user.getMpOpenId());
                         o.setOrderType(4);
                         o.setOrderId(order.getOrderId().toString());
-                        o.setPayType(Arrays.asList(PayType.支付宝条码支付.getCode()));
+                        o.setPayType(Arrays.asList(PayType.ALIPAY_BARCODE_PAYMENT.getCode()));
                         TzBankResult<PayCreateOrderResult> result = tzBankService.createOrder(o);
                         FsStorePayment mt=new FsStorePayment();
                         mt.setPaymentId(storePayment.getPaymentId());
@@ -591,11 +591,11 @@ public class FsUserCourseOrderServiceImpl implements IFsUserCourseOrderService
                         paymentMap.setStatus(1);
                         paymentMap.setPayTime(new Date());
                         paymentMap.setTradeNo(tradeNo);
-                        if(payType.equals(PayType.微信小程序支付.getCode())){
-                            paymentMap.setPayTypeCode(PayType.微信小程序支付.name());
+                        if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
+                            paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                         }
-                        else if(payType.equals(PayType.支付宝条码支付.getCode())){
-                            paymentMap.setPayTypeCode(PayType.支付宝条码支付.name());
+                        else if(payType.equals(PayType.ALIPAY_BARCODE_PAYMENT.getCode())){
+                            paymentMap.setPayTypeCode(PayType.ALIPAY_BARCODE_PAYMENT.name());
                         }
                         fsStorePaymentMapper.updateFsStorePayment(paymentMap);
                         order=fsUserCourseOrderMapper.selectFsUserCourseOrderByOrderId(Long.parseLong(storePayment.getBusinessId()));

fs-service/src/main/java/com/fs/course/service/impl/FsUserVipOrderServiceImpl.java

@@ -394,7 +394,7 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
 //                        o.setOpenId(user.getMpOpenId());
                         o.setOrderType(5);
                         o.setOrderId(order.getOrderId().toString());
-                        o.setPayType(Arrays.asList(PayType.支付宝条码支付.getCode()));
+                        o.setPayType(Arrays.asList(PayType.ALIPAY_BARCODE_PAYMENT.getCode()));
                         TzBankResult<PayCreateOrderResult> result = tzBankService.createOrder(o);
                         FsStorePayment mt=new FsStorePayment();
                         mt.setPaymentId(storePayment.getPaymentId());
@@ -443,11 +443,11 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
                         paymentMap.setStatus(1);
                         paymentMap.setPayTime(new Date());
                         paymentMap.setTradeNo(tradeNo);
-                        if(payType.equals(PayType.微信小程序支付.getCode())){
-                            paymentMap.setPayTypeCode(PayType.微信小程序支付.name());
+                        if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
+                            paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                         }
-                        else if(payType.equals(PayType.支付宝条码支付.getCode())){
-                            paymentMap.setPayTypeCode(PayType.支付宝条码支付.name());
+                        else if(payType.equals(PayType.ALIPAY_BARCODE_PAYMENT.getCode())){
+                            paymentMap.setPayTypeCode(PayType.ALIPAY_BARCODE_PAYMENT.name());
                         }
                         fsStorePaymentMapper.updateFsStorePayment(paymentMap);
                         order=fsUserVipOrderMapper.selectFsUserVipOrderByOrderId(Long.parseLong(storePayment.getBusinessId()));

fs-service/src/main/java/com/fs/his/service/IFsStoreOrderService.java

@@ -16,6 +16,7 @@ import com.fs.his.dto.ExpressResultDTO;
 import com.fs.his.dto.StoreOrderExpressExportDTO;
 import com.fs.his.param.*;
 import com.fs.his.vo.*;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 订单Service接口
@@ -150,6 +151,9 @@ public interface IFsStoreOrderService
 
     void addFsFollowByStoreOrder(FsStoreOrder order);
 
+    @Transactional
+    R finishStoreOrder(Long orderId);
+
     List<FsStoreOrderExportVO> selectFsStoreOrderListVOByExport(FsStoreOrderParam param);
 
     List<FsInquiryOrderMsg> selectFsInquiryOrderMsgByStoreOrderId(FsFollowMsgParam fsFollowMsgParam);

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderServiceImpl.java

@@ -733,11 +733,11 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
                         paymentMap.setStatus(1);
                         paymentMap.setPayTime(new Date());
                         paymentMap.setTradeNo(tradeNo);
-                        if(payType.equals(PayType.微信小程序支付.getCode())){
-                            paymentMap.setPayTypeCode(PayType.微信小程序支付.name());
+                        if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
+                            paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                         }
-                        else if(payType.equals(PayType.支付宝条码支付.getCode())){
-                            paymentMap.setPayTypeCode(PayType.支付宝条码支付.name());
+                        else if(payType.equals(PayType.ALIPAY_BARCODE_PAYMENT.getCode())){
+                            paymentMap.setPayTypeCode(PayType.ALIPAY_BARCODE_PAYMENT.name());
                         }
                         if (storePayment.getPayMode().equals("yb")){
                             OrderQueryDTO orderQueryDTO = new OrderQueryDTO();

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -655,11 +655,11 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                     paymentMap.setStatus(1);
                     paymentMap.setPayTime(new Date());
                     paymentMap.setTradeNo(tradeNo);
-                    if(payType.equals(PayType.微信小程序支付.getCode())){
-                        paymentMap.setPayTypeCode(PayType.微信小程序支付.name());
+                    if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
+                        paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                     }
-                    else if(payType.equals(PayType.支付宝条码支付.getCode())){
-                        paymentMap.setPayTypeCode(PayType.支付宝条码支付.name());
+                    else if(payType.equals(PayType.ALIPAY_BARCODE_PAYMENT.getCode())){
+                        paymentMap.setPayTypeCode(PayType.ALIPAY_BARCODE_PAYMENT.name());
                     }
                     if (storePayment.getPayMode().equals("yb")){
                         OrderQueryDTO orderQueryDTO = new OrderQueryDTO();
@@ -881,9 +881,6 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
     @Override
     @Transactional
     public R payment(FsPackageOrderDoPayParam param) {
-        //回滚事务
-        //     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        //     return return R.error("");
         //更新订单状态
         FsPackageOrder fsPackageOrder=fsPackageOrderMapper.selectFsPackageOrderByOrderId(param.getOrderId());
         if(!fsPackageOrder.getStatus().equals(FsPackageOrderStatusEnum.STATUS_1.getValue())){
@@ -1127,7 +1124,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
 //                        o.setOpenId(user.getMpOpenId());
                         o.setOrderType(3);
                         o.setOrderId(fsPackageOrder.getOrderId().toString());
-                        o.setPayType(Arrays.asList(PayType.支付宝条码支付.getCode()));
+                        o.setPayType(Arrays.asList(PayType.ALIPAY_BARCODE_PAYMENT.getCode()));
                         TzBankResult<PayCreateOrderResult> result = tzBankService.createOrder(o);
                         FsStorePayment mt=new FsStorePayment();
                         mt.setPaymentId(storePayment.getPaymentId());
@@ -1212,7 +1209,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                         o.setOpenId(user.getMpOpenId());
                         o.setOrderType(3);
                         o.setOrderId(fsPackageOrder.getOrderId().toString());
-                        o.setPayType(Arrays.asList(PayType.微信公众号.getCode()));
+                        o.setPayType(Arrays.asList(PayType.WECHAT_PUBLIC_ACCOUNT.getCode()));
                         TzBankResult<PayCreateOrderResult> result = tzBankService.createOrder(o);
                         FsStorePayment mt=new FsStorePayment();
                         mt.setPaymentId(storePayment.getPaymentId());
@@ -1300,7 +1297,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                         o.setOpenId(user.getMpOpenId());
                         o.setOrderType(3);
                         o.setOrderId(fsPackageOrder.getOrderId().toString());
-                        o.setPayType(Arrays.asList(PayType.支付宝条码支付.getCode()));
+                        o.setPayType(Arrays.asList(PayType.ALIPAY_BARCODE_PAYMENT.getCode()));
                         TzBankResult<PayCreateOrderResult> result = tzBankService.createOrder(o);
                         FsStorePayment mt=new FsStorePayment();
                         mt.setPaymentId(storePayment.getPaymentId());

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.his.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.net.URLDecoder;
 import cn.hutool.core.util.StrUtil;
@@ -62,7 +63,6 @@ import com.fs.im.service.IImService;
 import com.fs.qw.domain.QwExternalContact;
 import com.fs.qw.domain.QwUser;
 import com.fs.qw.mapper.QwExternalContactMapper;
-import com.fs.sop.mapper.QwSopLogsMapper;
 import com.fs.qw.service.impl.QwUserServiceImpl;
 import com.fs.system.domain.SysConfig;
 import com.fs.tzBankPay.doman.*;
@@ -83,16 +83,18 @@ import com.google.gson.Gson;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -114,9 +116,9 @@ import static com.fs.his.utils.PhoneUtil.decryptPhone;
 @Lazy
 @Service
 @Slf4j
+@EnableAspectJAutoProxy(exposeProxy = true,proxyTargetClass = true)
 public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 {
-    Logger logger= LoggerFactory.getLogger(getClass());
     @Autowired
     private WxPayService wxPayService;
     @Autowired
@@ -157,15 +159,15 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     @Autowired
     private IFsExpressService expressService;
     @Autowired
-    HisApiService hisApiService;
+    private HisApiService hisApiService;
     @Autowired
-    FsInquiryOrderMapper fsInquiryOrderMapper;
+    private FsInquiryOrderMapper fsInquiryOrderMapper;
     @Autowired
     private ICompanyService companyService;
     @Autowired
     private CompanyMapper companyMapper;
     @Autowired
-    ICompanyUserService companyUserService;
+    private ICompanyUserService companyUserService;
     @Autowired
     private IFsUserService userService;
     @Autowired
@@ -227,28 +229,28 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     @Autowired
     private IFsInquiryOrderService inquiryOrderService;
     @Autowired
-    FsFollowReportMapper fsFollowReportMapper;
+    private FsFollowReportMapper fsFollowReportMapper;
     @Autowired
-    FsStoreSubOrderServiceImpl storeSubOrderService;
+    private FsStoreSubOrderServiceImpl storeSubOrderService;
     @Autowired
-    ApplicationEventPublisher publisher;
+    private ApplicationEventPublisher publisher;
 
     @Autowired
-    IFsUserWatchService fsUserWatchService;
+    private IFsUserWatchService fsUserWatchService;
     @Autowired
-    QwExternalContactMapper qwExternalContactMapper;
-    @Autowired
-    QwSopLogsMapper qwSopLogsMapper;
-
-    @Autowired
-    private IFsExportTaskService exportTaskService;
+    private QwExternalContactMapper qwExternalContactMapper;
     @Autowired
     private QwUserServiceImpl qwUserServiceImpl;
     @Autowired
     private IFsStoreProductGroupService storeProductGroupService;
     @Autowired
-    CloudHostProper cloudHostProper;
+    private CloudHostProper cloudHostProper;
+    @Autowired
+    private IFsPrescribeService fsPrescribeService;
+
 
+    @Value("${express.omsCode}")
+    private String expressOmsCode;
     /**
      * 查询订单
      *
@@ -391,9 +393,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         o1.setFinishTime(new Date());
         o1.setOrderId(orderId);
         o1.setStatus(FsStoreOrderStatusEnum.STATUS_4.getValue());
-        logger.info("确认收货："+orderId);
+        log.info("确认收货："+orderId);
         if (order.getCompanyId()!=null&&order.getTuiMoneyStatus()==0&&order.getPayType()==1){
-            logger.info("分佣："+orderId);
+            log.info("分佣："+orderId);
             companyService.addCompanyMoney(order);
             o1.setTuiMoneyTime(new Date());
         }
@@ -441,19 +443,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 userCouponService.updateFsUserCoupon(userCoupon);
             }
             //退回库存
-//            this.refundStock(order);
             fsStoreOrderMapper.cancelOrder(orderId);
             //添加记录
             fsStoreOrderLogsService.create(order.getOrderId(), FsStoreOrderLogEnum.CANCEL_ORDER.getValue(),
                     FsStoreOrderLogEnum.CANCEL_ORDER.getDesc());
 
-//            TemplateBean templateBean = TemplateBean.builder()
-//                    .orderId(order.getOrderId().toString())
-//                    .remark("您的订单已取消")
-//                    .uid(order.getUserId())
-//                    .templateType(TemplateListenEnum.TYPE_1.getValue())
-//                    .build();
-//            publisher.publishEvent(new TemplateEvent(this, templateBean));
             return R.ok("操作成功");
         }
         else{
@@ -477,7 +471,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                         //判断完成时间是否超过指定时间
                         Calendar calendar = new GregorianCalendar();
                         calendar.setTime(vo.getFinishTime());
-                        calendar.add(calendar.DATE,storeConfig.getStoreAfterSalesDay()); //把日期往后增加一天,整数  往后推,负数往前移动
+                        //把日期往后增加一天,整数  往后推,负数往前移动
+                        calendar.add(calendar.DATE,storeConfig.getStoreAfterSalesDay());
                         if(calendar.getTime().getTime()<new Date().getTime()){
                             vo.setIsAfterSales(0);
                         }
@@ -601,24 +596,17 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         FsPackage fsPackage=fsPackageMapper.selectFsPackageByPackageId(packageOrder.getPackageId());
         JSONArray objects =JSONUtil.parseArray(fsPackage.getProductJson());
         List<FsPackagePruductDTO> products=JSONUtil.toList(objects,FsPackagePruductDTO.class);
-//        boolean isDrug=false;
-//        for (FsPackagePruductDTO product : products) {
-//            if (product.getIsDrug()==1){
-//                isDrug=true;
-//            }
-//        }
-//        Long prescribeId=null;
 
         Map<String,Object> packageJson = (Map)JSON.parse(packageOrder.getPackageJson());
         Integer packageSubType = (Integer)packageJson.get("packageSubType");
         if (packageSubType==3){
-            R orderByPackageOrderStatus4 = inquiryOrderService.createOrderByPackageOrderStatus4(packageOrder);
+            inquiryOrderService.createOrderByPackageOrderStatus4(packageOrder);
         }
         Long  prescribeId= fsPrescribeService.insertFsPrescribeByPackageOrder(packageOrder);
 
         FsStoreOrder order=new FsStoreOrder();
         List<FsStoreOrderItem> items=new ArrayList<>();
-        logger.info("套餐包生成药品订单："+packageOrder.getOrderSn());
+        log.info("套餐包生成药品订单：{}",packageOrder.getOrderSn());
         order.setOrderCode(packageOrder.getOrderSn());
         order.setUserId(packageOrder.getUserId());
         order.setStoreId(fsPackage.getStoreId());
@@ -778,10 +766,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             }
         }
 
-
-
-
-
         order.setOrderType(fsPackage.getProductType());
         order.setTotalNum(totalNum);
         order.setTotalPrice(totalPrice);
@@ -822,7 +806,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 fsFollow.setCompanyUserId(packageOrder.getCompanyUserId());
                 fsFollow.setDeptId(packageOrder.getDeptId());
                 fsFollow.setNum(1);
-//            fsFollow.setPackageOrderId(order.getOrderId());
                 fsFollow.setInquiryOrderId(packageOrder.getInquiryOrderId());
                 fsFollow.setPlanTime(DateUtils.getNowDate());
                 fsFollow.setPushStatus(1);
@@ -883,21 +866,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             try {
                 storeSubOrderService.insertFsStoreSubOrderByStoreOrder(order.getOrderId());
             }catch (Exception e){
-                logger.info("拆分订单错误："+order.getOrderId());
-            }
-//            try {
-//                if (fsPackage.getProductType()==2){
-//                    fsStoreOrderService.tuiOrder(order.getOrderId());
-//                }else if (fsPackage.getProductType()==1){
-//                    fsStoreOrderService.createOmsOrder(order.getOrderId());
-//                }else {
-//
-//                }
-//
-//            } catch (ParseException e) {
-//                throw new RuntimeException(e);
-//            }
-//            tuiOrderUtil.TuiOrderByPackage(order);
+                log.info("拆分订单错误：{}",order.getOrderId());
+            }
         }
 
         return R.ok();
@@ -938,10 +908,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     throw new CustomException("订单编号为空");
                 }
 
-//                if (vo.getDeliveryCode() == null || vo.getDeliveryCode().isEmpty()) {
-//                    throw new CustomException("快递公司编号为空");
-//                }
-
                 if (vo.getDeliveryName() == null || vo.getDeliveryName().isEmpty()) {
                     throw new CustomException("快递名称为空");
                 }
@@ -1023,10 +989,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         }
     }
 
-
-
-
-
     @Override
     public int tuiOrder(Long orderId) {
 
@@ -1054,7 +1016,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         FsStoreOrderItem item = new FsStoreOrderItem();
         item.setOrderId(o.getOrderId());
         List<FsStoreOrderItem> fsStoreOrderItems = fsStoreOrderItemMapper.selectFsStoreOrderItemList(item);
-        logger.info(""+fsStoreOrderItems);
+        log.info(""+fsStoreOrderItems);
         ArrayList<RecipeDetailParam> list = new ArrayList<>();
         Integer i=1;
         BigDecimal dprice = new BigDecimal(0);
@@ -1065,7 +1027,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             FsProdItemDTO fsProdItemDTO = JSON.parseObject(json, FsProdItemDTO.class);
             String barCode = fsProdItemDTO.getBarCode();
 
-            logger.info(""+fsProdItemDTO);
+            log.info(""+fsProdItemDTO);
             if(fsStoreOrderItem.getIsGift()!=null&&fsStoreOrderItem.getIsGift()==1){
                 continue;
             }
@@ -1131,11 +1093,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         op.setAttention(remark);//医嘱
         op.setSymptoms(fp.getDiagnose());
         op.setRecipe_time(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(fp.getCreateTime()));
-//        op.setOperation_time("Jane");
-//        op.setOperation_time("2023-08-22 11:00:00");
-//        op.setPricing_id("pricing123");
-//        op.setPricing_cashier("Alice");
-//        op.setPricing_time("2023-08-22 12:00:00");
         op.setPrice(dprice.toString());
         op.setPrice_total(dprice.multiply(new BigDecimal(usage.getCounts())).toString());
         op.setRecipe_sale_price(o.getPayMoney().toString()); //实际收款
@@ -1149,10 +1106,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             op.setPatient_id(fp.getPatientId().toString());
         }
 
-        //op.setVisit_id("visit789");
-     //   op.setUsage_desc("备用字段描述");
         op.setAddress(o.getUserAddress());
-       // op.setRefund_name("");
         op.setRecipe_detail_list(list);
         ApiResponse order = hisApiService.createOrder(op);
         if (order.getState().equals("error")){
@@ -1165,8 +1119,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
         return 1;
     }
-    @Autowired
-    IFsPrescribeService fsPrescribeService;
+
     @Override
     public FsPrescribeVO selectFsPrescribeByPrescribeIdVO(Long prescribeId) {
         return  prescribeMapper.selectFsPrescribeByPrescribeIdVO(prescribeId);
@@ -1262,16 +1215,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     storeOrder.setUserName(address.getRealName().trim());
                     storeOrder.setUserPhone(address.getPhone().trim());
                     storeOrder.setUserAddress(address.getProvince()+" "+address.getCity()+" "+address.getDistrict()+" "+address.getDetail());
-//                    String noAdd="南通市,镇江市,淮安市,江阴市,金华市,驻马店市";
-//                    String[] split = noAdd.split(",");
-//                    for (String s : split) {
-//                        if (s.equals(address.getCity())){
-//                            return R.error("此地区暂不支持配送");
-//                        }
-//                    }
-//                    if ("民权县".equals(address.getDistrict())){
-//                        return R.error("此地区暂不支持配送");
-//                    }
                 }
             }
             else{
@@ -1417,7 +1360,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         return fsStoreOrderVOS;
     }
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
     public R payConfirm(String orderCode,String payCode, String tradeNo,String payType,Integer type) {
         try {
             FsStoreOrder order=null;
@@ -1426,17 +1369,17 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 FsStorePayment storePayment = fsStorePaymentMapper.selectFsStorePaymentByPaymentCode(payCode);
                 if (storePayment!=null){
                     if(storePayment.getStatus().equals(0)){
-                        logger.info(payCode+"待支付");
+                        log.info(payCode+"待支付");
                         FsStorePayment paymentMap=new FsStorePayment();
                         paymentMap.setPaymentId(storePayment.getPaymentId());
                         paymentMap.setStatus(1);
                         paymentMap.setPayTime(new Date());
                         paymentMap.setTradeNo(tradeNo);
-                        if(payType.equals(PayType.微信小程序支付.getCode())){
-                            paymentMap.setPayTypeCode(PayType.微信小程序支付.name());
+                        if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
+                            paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                         }
-                        else if(payType.equals(PayType.支付宝条码支付.getCode())){
-                            paymentMap.setPayTypeCode(PayType.支付宝条码支付.name());
+                        else if(payType.equals(PayType.ALIPAY_BARCODE_PAYMENT.getCode())){
+                            paymentMap.setPayTypeCode(PayType.ALIPAY_BARCODE_PAYMENT.name());
                         }
                         if (storePayment.getPayMode().equals("yb")){
                             OrderQueryDTO orderQueryDTO = new OrderQueryDTO();
@@ -1446,12 +1389,12 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                             paymentMap.setBankTransactionId(orderResult.getBankTrxId());
                         }
                         fsStorePaymentMapper.updateFsStorePayment(paymentMap);
-                        logger.info(payCode+"已支付");
+                        log.info(payCode+"已支付");
                         order=fsStoreOrderMapper.selectFsStoreOrderByOrderId(Long.parseLong(storePayment.getBusinessId()));
                     }
                 }
                 else{
-                    logger.info(payCode+"支付单号不存在");
+                    log.info(payCode+"支付单号不存在");
                     return R.error("支付单号不存在");
                 }
             }
@@ -1459,12 +1402,12 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 order=fsStoreOrderMapper.selectFsStoreOrderByOrderCode(orderCode);
             }
             if(order!=null&&!order.getStatus().equals(FsStoreOrderStatusEnum.STATUS_1.getValue())){
-                logger.info(payCode+"订单号不为待支付回退");
+                log.info(payCode+"订单号不为待支付回退");
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return R.error();
             }
             if(order!=null&&!order.getIsPay().equals(0)){
-                logger.info(payCode+"订单号支付不为待支付回退");
+                log.info(payCode+"订单号支付不为待支付回退");
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return R.error();
             }
@@ -1507,7 +1450,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             }
             return R.ok();
         }catch (Exception e){
-            logger.info(payCode+"异常了"+e.getMessage());
+            log.info(payCode+"异常了"+e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             FsStorePaymentError err = new FsStorePaymentError();
             err.setOrderNo(orderCode);
@@ -1563,7 +1506,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public int afterSales(FsStoreOrderSalesParam fsStoreOrderSalesParam) {
         FsStoreOrder order = fsStoreOrderMapper.selectFsStoreOrderByOrderId(fsStoreOrderSalesParam.getOrderId());
         if (order.getStatus()<0){
@@ -1700,11 +1643,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             erpOrder.setVip_code(order.getUserId().toString());
         }
         erpOrder.setPlatform_code(order.getOrderCode());
-//        if(order.getStoreHouseCode()==null){
-//            erpOrder.setWarehouse_code("CQDS001");
-//        }else{
-//            erpOrder.setWarehouse_code(order.getStoreHouseCode());
-//        }
 
         erpOrder.setShop_code(sysConfig.getErpShopCode());
         erpOrder.setSeller_memo(order.getRemark());
@@ -1871,9 +1809,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         String s = fsPrescribeService.PrescribeImg(order.getPrescribeId());
         erpOrder.setSeller_memo(erpOrder.getSeller_memo()+"||"+s+"||");
         ErpOrderResponse response= erpOrderService.addOrder(erpOrder);
-        logger.info("ErpCreate:"+order.getOrderCode()+":"+JSONUtil.toJsonStr(response));
-        if(response.getSuccess()){
-
+        log.info("ErpCreate:"+order.getOrderCode()+":"+JSONUtil.toJsonStr(response));
+        if(Boolean.TRUE.equals(response.getSuccess())){
             //支付成功后 将订单号写入待发货的REDIS中
             redisCache.setCacheObject("delivery"+":"+response.getCode(),order.getOrderCode());
             //写入外部订单号
@@ -1883,34 +1820,16 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 order.setExtendOrderId(response.getCode());
             }
             fsStoreOrderMapper.updateFsStoreOrder(order);
-        }else {
-//            if (response.getErrorDesc().equals("该订单已创建")){
-//                ErpOrderQueryRequert erpOrderQueryRequert = new ErpOrderQueryRequert();
-//                erpOrderQueryRequert.setPlatform_code(order.getOrderCode());
-//                ErpOrderQueryResponse erp = erpOrderService.getOrder(erpOrderQueryRequert);
-//                logger.info("ErpCreate:"+order.getOrderCode()+":"+JSONUtil.toJsonStr(response));
-//
-//                if (erp.getOrders()!=null&&erp.getOrders().size()>0){
-//                    ErpOrderQuery epr = erp.getOrders().get(0);
-//                    redisCache.setCacheObject("delivery"+":"+epr.getCode(),order.getOrderCode());
-//                    order.setExtendOrderId(epr.getCode());
-//                    fsStoreOrderMapper.updateFsStoreOrder(order);
-//                }
-//            }
         }
         //写入日志
 
-
     }
 
-
-
-
     @Override
     public ExpressResultDTO updateDeliveryItem(ExpressNotifyDTO notifyDTO) {
         String data= URLDecoder.decode(notifyDTO.getRequestData(), Charset.forName("UTF-8"));
         //ExpressInfoDTO
-        logger.info("快递根踪回调:"+data);
+        log.info("快递根踪回调: {}",data);
         FsSysConfig sysConfig = configUtil.getSysConfig();
         ExpressDataDTO expressDataDTO=JSONUtil.toBean(data,ExpressDataDTO.class);
         if(expressDataDTO!=null&&expressDataDTO.getData()!=null){
@@ -1918,8 +1837,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 List<FsStoreOrder> orders=this.selectFsStoreOrderListByDeliveryId(dto.getLogisticCode());
                 if(orders!=null){
                     for(FsStoreOrder order:orders){
-                        logger.info("订单信息:"+JSONUtil.toJsonStr(order));
-                        logger.info("运单号:"+dto.getLogisticCode());
+                        log.info("订单信息: {}",JSONUtil.toJsonStr(order));
+                        log.info("运单号: {}",dto.getLogisticCode());
                         if(order!=null && (order.getDeliveryStatus()==null||order.getDeliveryStatus()!=3)){
                             if (dto.getState()!=null&&dto.getStateEx()!=null){
                                 FsStoreOrder map=new FsStoreOrder();
@@ -1934,7 +1853,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                                 }
                             }
                             if (!dto.isSuccess()){
-                                logger.info("物流状态异常：{}"+dto);
+                                log.info("物流状态异常：{}",dto);
                             }
                             if ((!dto.isSuccess()&&dto.getReason()!=null&&dto.getReason().equals("三天无轨迹"))||(!dto.isSuccess()&&dto.getReason()!=null&&dto.getReason().equals("七天内无轨迹变化"))){
                                 //订阅物流回调
@@ -1946,7 +1865,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                                     }
                                 }
                                 expressService.subscribeEspress(order.getOrderCode(),order.getDeliveryCode(),order.getDeliverySn(),lastFourNumber);
-                                logger.info("物流重新订阅：{}",order.getDeliverySn());
+                                log.info("物流重新订阅：{}",order.getDeliverySn());
                             }
 
                         }
@@ -1965,7 +1884,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public R syncExpress(Long id) {
 
         FsStoreOrder order = fsStoreOrderMapper.selectFsStoreOrderByOrderId(id);
@@ -2058,7 +1977,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
     public R editTuiMoney(Long id) {
         FsStoreOrder order= fsStoreOrderMapper.selectFsStoreOrderByOrderId(id);
         if(order.getStatus()==4){
@@ -2131,8 +2050,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
         for (StoreOrderExpressExportDTO dto : list)
         {
-//            try
-//            {
                 FsStoreOrder order=fsStoreOrderMapper.selectFsStoreOrderListByDeliverySnLOne(dto.getDeliverySn());
                 if (StringUtils.isNull(order))
                 {
@@ -2168,13 +2085,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     }
                 }
             }
-//            catch (Exception e)
-//            {
-//                String msg = "<br/>" + failureNum + "、快递单号 " + dto.getDeliverySn() + " 导入异常：";
-//                importErrorMsg.append(msg+e.getMessage());
-//                failureNum++;
-//            }
-//        }
         importMsg.insert(0, "导入完成！成功" + successNum + " 条，失败"+failureNum+"条。");
         importMsg.append(importErrorMsg.toString());
         importMsg.append(importSuccessMsg.toString());
@@ -2201,7 +2111,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
     @Override
     public synchronized  R finishOrder(Long orderId) {
-        return finishStoreOrder(orderId);
+        IFsStoreOrderService iFsStoreOrderService = (IFsStoreOrderService) AopContext.currentProxy();
+        return iFsStoreOrderService.finishStoreOrder(orderId);
     }
 
     @Override
@@ -2262,26 +2173,16 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         }
     }
 
-    @Transactional
+    @Override
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public R finishStoreOrder(Long orderId){
         FsStoreOrder order= fsStoreOrderMapper.selectFsStoreOrderByOrderId(orderId);
-        if(order.getStatus()==FsStoreOrderStatusEnum.STATUS_3.getValue()){
+        if(Objects.equals(order.getStatus(), FsStoreOrderStatusEnum.STATUS_3.getValue())){
             order.setFinishTime(new Date());
             order.setStatus(4);
             fsStoreOrderMapper.updateFsStoreOrder(order);
             fsStoreOrderLogsService.create(order.getOrderId(), FsStoreOrderLogEnum.FINISH_ORDER.getValue(),
                     FsStoreOrderLogEnum.FINISH_ORDER.getDesc());
-
-            //模板消息支付成功发布事件
-//            TemplateBean templateBean = TemplateBean.builder()
-//                    .orderId(order.getOrderId().toString())
-//                    .title(order.getOrderCode().toString())
-//                    .remark("您的订单已签收成功")
-//                    .time(order.getFinishTime())
-//                    .uid(order.getUserId())
-//                    .templateType(TemplateListenEnum.TYPE_3.getValue())
-//                    .build();
-//            publisher.publishEvent(new TemplateEvent(this, templateBean));
             return R.ok("操作成功");
         }
         else {
@@ -2306,7 +2207,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public void addIntegralAndShareByStoreOrder(FsStoreOrder fsStoreOrder) {
         fsUserService.addUserIntegral(fsStoreOrder.getPayMoney(),fsStoreOrder.getUserId(),fsStoreOrder.getOrderId(),2);
         FsStoreOrder order = new FsStoreOrder();
@@ -2357,10 +2258,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                             sharePayment.setShareMoney(new BigDecimal(r.getBody().getTrxAmt()));
                             fsStorePaymentMapper.updateFsStorePayment(sharePayment);
                         }else {
-                            logger.info("分账失败:"+fsStorePayment);
+                            log.error("分账失败: {}",fsStorePayment);
                         }
                     }else {
-                        logger.info("分账请求失败:"+fsStorePayment+r.getRetMsg());
+                        log.error("分账请求失败: {}",fsStorePayment+r.getRetMsg());
                     }
 
             }
@@ -2378,7 +2279,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             Long followDoctorId = fsStoreOrder.getFollowDoctorId();
             List<FsStoreOrder> orders = fsStoreOrderMapper.selectFsStoreOrderEndFollowByUserIdAndDocId(userId,followDoctorId);
 
-            if (orders==null||orders.size()==0){
+            if (CollectionUtils.isEmpty(orders)){
                 Long l = fsStoreOrderMapper.selectFsStoreOrderFollow(userId, followDoctorId);
                 MsgDTO msgDTO=new MsgDTO();
                 MsgCustomDTO customDTO=new MsgCustomDTO();
@@ -2396,10 +2297,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 msgs1.add(msg1);
                 msgDTO.setMsgBody(msgs1);
                 MsgResponseDTO msgResponseDTO = imService.sendMsg(msgDTO);
-                logger.info("医生结束随访"+msgResponseDTO);
-
-
-
+                log.info("医生结束随访"+msgResponseDTO);
             }
             FsStoreOrder o = new FsStoreOrder();
             o.setOrderId(fsStoreOrder.getOrderId());
@@ -2432,8 +2330,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             }
         }
     }
-    @Transactional
+
     @Override
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public void endDeliveryOrder() {
         List<FsStoreOrder> fsStoreOrders = fsStoreOrderMapper.selectEndDeliveryOrder();
         for (FsStoreOrder fsStoreOrder : fsStoreOrders) {
@@ -2465,7 +2364,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public R returnCost(Long orderId) {
         FsStoreOrder order = fsStoreOrderMapper.selectFsStoreOrderByOrderId(orderId);
         if (order!=null){
@@ -2488,7 +2387,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                                     continue;
                                 }
                                 BigDecimal money = logs.getMoney().multiply(new BigDecimal(-1));
-                                logger.info("退款佣金扣除:"+company.getCompanyId()+":"+money);
+                                log.info("退款佣金扣除:"+company.getCompanyId()+":"+money);
                                 company.setMoney(company.getMoney().subtract(logs.getMoney()));
                                 companyMapper.updateCompany(company);
                                 CompanyMoneyLogs log=new CompanyMoneyLogs();
@@ -2505,7 +2404,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                         if (!doesNotContain6){
                             if(logs.getLogsType()==5){
                                 BigDecimal money = logs.getMoney().multiply(new BigDecimal(-1));
-                                logger.info("退款成本返还:"+company.getCompanyId()+":"+money);
+                                log.info("退款成本返还:"+company.getCompanyId()+":"+money);
                                 company.setMoney(company.getMoney().add(money));
                                 companyMapper.updateCompany(company);
                                 CompanyMoneyLogs log=new CompanyMoneyLogs();
@@ -2629,7 +2528,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
             if(order.getPayMoney().compareTo(new BigDecimal(0))==0){
                 this.payConfirm(order.getOrderCode(),"","","",2);
-                // tuiOrderUtil.TuiOrder(order.getOrderId());
                 return R.ok().put("data",param.getOrderId()).put("isPay","1");
             }
             else {
@@ -2762,7 +2660,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         if(order==null){
             return R.error("订单不存在");
         }
-        if(order.getStatus()!= FsStoreOrderStatusEnum.STATUS_1.getValue()){
+        if(!Objects.equals(order.getStatus(), FsStoreOrderStatusEnum.STATUS_1.getValue())){
             return R.error("订单状态不正确");
         }
 
@@ -2770,7 +2668,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         if(user!=null&& StringUtils.isNotEmpty(user.getMaOpenId())){
 
             if(order.getPayMoney().compareTo(new BigDecimal(0))==0){
-                this.payConfirm(order.getOrderCode(),"","","",2);
+                IFsStoreOrderService fsStoreOrderService1 = (IFsStoreOrderService) AopContext.currentProxy();
+                fsStoreOrderService1.payConfirm(order.getOrderCode(),"","","",2);
                 return R.ok().put("data",param.getOrderId()).put("isPay","1");
             }
             else {
@@ -2813,7 +2712,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                         o.setGoodsInfo("药品订单支付"); // 订单信息
                         o.setOrderType(2);
                         o.setOrderId(order.getOrderId().toString());
-                        o.setPayType(Arrays.asList(PayType.支付宝条码支付.getCode()));
+                        o.setPayType(Arrays.asList(PayType.ALIPAY_BARCODE_PAYMENT.getCode()));
                         TzBankResult<PayCreateOrderResult> result = tzBankService.createOrder(o);
                         FsStorePayment mt=new FsStorePayment();
                         mt.setPaymentId(storePayment.getPaymentId());
@@ -2923,16 +2822,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             erpOrder.setVip_code(order.getUserId().toString());
         }
         erpOrder.setPlatform_code(order.getOrderCode());
-//        if(order.getStoreHouseCode()==null){
-//            erpOrder.setWarehouse_code("CQDS001");
-//        }
-//        else{
+
         erpOrder.setWarehouse_code(configUtil.getSysConfig().getErpWarehouseCode());
-//        }
-//        if(order.getStoreHouseCode().equals("YDSP001")){
-//            erpOrder.setShop_code("RunDayWuHan");
-//        }
-//        else{
         //判断是否开启erp
         FsSysConfig sysConfig = configUtil.getSysConfig();
         Integer erpOpen = sysConfig.getErpOpen();
@@ -2950,15 +2841,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             }
         }
 
-//        }
-//      erpOrder.setPost_fee(order.getTotalPostage().doubleValue());
         erpOrder.setSeller_memo(order.getRemark());
-        // order.setCurrency_code("JCZD");
         List<ErpOrderPayment> payments=new ArrayList<>();
         ErpOrderPayment payment=new ErpOrderPayment();
         payment.setPay_type_code("weixin");
         payment.setPayment(order.getPayMoney().doubleValue());
-        //payment.setPaytime(new Timestamp(System.currentTimeMillis()));
         if(order.getPayTime()!=null){
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String timeString = sdf.format(order.getPayTime());
@@ -2994,18 +2881,12 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             Company company = companyService.selectCompanyById(order.getCompanyId());
             if (order.getPayDelivery().compareTo(new BigDecimal(0)) == 0) {  //没有物流代收(全款订单)
                 FsExpress express = new FsExpress();
-                //express=expressService.selectFsExpressByOmsCode("SF.0235402855");
                 if(order.getPayPrice().compareTo(new BigDecimal(100))<=0){
                     express=expressService.selectFsExpressByOmsCode("ZTPDD");
                 }
                 else{
                     boolean found = containsAddress(order.getUserAddress());
-                    if(found){
-                        express=expressService.selectFsExpressByOmsCode("SF.0235402855");
-                    }
-                    else{
-                        express=expressService.selectFsExpressByOmsCode("SF.0235402855");
-                    }
+                    express=expressService.selectFsExpressByOmsCode(expressOmsCode);
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
                 order.setDeliveryName(express.getName());
@@ -3025,7 +2906,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     if(StringUtils.isNotEmpty(company.getOmsCode())){
                         express = expressService.selectFsExpressByOmsCode(company.getOmsCode());
                     }else{
-                        express = expressService.selectFsExpressByOmsCode("SF.0235402855");
+                        express = expressService.selectFsExpressByOmsCode(expressOmsCode);
                     }
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
@@ -3046,12 +2927,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     express=expressService.selectFsExpressByOmsCode("ZTPDD");
                 }else{
                     boolean found = containsAddress(order.getUserAddress());
-                    if(found){
-                        express=expressService.selectFsExpressByOmsCode("SF.0235402855");
-                    }
-                    else{
-                        express=expressService.selectFsExpressByOmsCode("SF.0235402855");
-                    }
+                    express=expressService.selectFsExpressByOmsCode(expressOmsCode);
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
                 order.setDeliveryName(express.getName());
@@ -3069,7 +2945,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     express=expressService.selectFsExpressByOmsCode("EMS.1");
                 }
                 else {
-                    express=expressService.selectFsExpressByOmsCode("SF.0235402855");
+                    express=expressService.selectFsExpressByOmsCode(expressOmsCode);
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
                 order.setDeliveryName(express.getName());
@@ -3089,9 +2965,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 CompanyDept dept=companyDeptService.selectCompanyDeptById(companyUser.getDeptId());
                 if(dept!=null){
                     List<String> names=companyDeptService.selectCompanyDeptNamesByIds(dept.getAncestors());
-                    if(names!=null&&names.size()>0){
+                    if(CollectionUtil.isNotEmpty(names)){
                         //写备注
-                        erpOrder.setSeller_memo(erpOrder.getSeller_memo()+"-"+StringUtils.join(names, ",")+","+dept.getDeptName() );
+                        erpOrder.setSeller_memo(erpOrder.getSeller_memo()+"-"+ StringUtils.join(names, ",")+","+dept.getDeptName() );
                     }
                 }
                 erpOrder.setSeller_memo(erpOrder.getSeller_memo()+"-"+companyUser.getNickName());
@@ -3100,7 +2976,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
         if("WHSP001".equals(order.getStoreHouseCode())){
             //武汉不备注快递史
-            //erpOrder.setSeller_memo(erpOrder.getSeller_memo()+"-"+order.getDeliveryName());
         }
         else{
             erpOrder.setSeller_memo(erpOrder.getSeller_memo()+"-"+ order.getDeliveryName());
@@ -3113,11 +2988,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         remarkDTO.setCouponMoney(order.getCouponPrice());
         remarkDTO.setOrderId(order.getOrderCode());
         remarkDTO.setYdMoney(order.getPayPrice().subtract(order.getPayMoney().subtract(order.getPayDelivery())));
-//        //套餐标题也传过去
-//        if (order.getOrderCreateType() == 2){
-//            JSONObject jsonStr = JSONObject.parseObject(order.getPackageJson());
-//            remarkDTO.setPackageTitle(jsonStr.getString("title"));
-//        }
 
         if(order.getPayTime()!=null){
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

fs-service/src/main/java/com/fs/tzBankPay/RequestController.java

@@ -43,7 +43,7 @@ public class RequestController {
         o.setPayCertType("22"); // 证件类型
         o.setPayCertNo("520321199801300897"); // 证件号码
 
-        List<String> payType = Arrays.asList(PayType.微信二维码支付.getCode(),PayType.支付宝条码支付.getCode());
+        List<String> payType = Arrays.asList(PayType.WECHAT_QR_CODE_PAYMENT.getCode(),PayType.ALIPAY_BARCODE_PAYMENT.getCode());
         //    o.setPayType(payType); // 支付方式
         //o.setClientIp("YourClientIp"); // 客户端 IP
 //        o.setRiskClientImei("1582220"); // 手机 Imei 数字人民币支付必传
@@ -121,7 +121,7 @@ public class RequestController {
         o.setPayCertType("22"); // 证件类型
         o.setPayCertNo("520321199801300897"); // 证件号码
 
-        List<String> payType = Arrays.asList(PayType.微信二维码支付.getCode(),PayType.支付宝条码支付.getCode());
+        List<String> payType = Arrays.asList(PayType.WECHAT_QR_CODE_PAYMENT.getCode(),PayType.ALIPAY_BARCODE_PAYMENT.getCode());
     //    o.setPayType(payType); // 支付方式
         //o.setClientIp("YourClientIp"); // 客户端 IP
 //        o.setRiskClientImei("1582220"); // 手机 Imei 数字人民币支付必传

fs-service/src/main/java/com/fs/tzBankPay/TzBankService/TzBankServiceImpl/TzBankServiceImpl.java

@@ -47,7 +47,7 @@ public class TzBankServiceImpl implements TzBankService {
         // 增加一个小时
         Instant oneHourLater = currentTimestamp.plusSeconds(3600);
         order.setExpiredTime(oneHourLater.toEpochMilli()+""); // 订单过期时间
-        List<String> payType = Arrays.asList(PayType.微信小程序支付.getCode(),PayType.支付宝条码支付.getCode());
+        List<String> payType = Arrays.asList(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode(),PayType.ALIPAY_BARCODE_PAYMENT.getCode());
         if(order.getPayType()==null){
             order.setPayType(payType);
         }

fs-service/src/main/java/com/fs/tzBankPay/doman/PayType.java

@@ -1,27 +1,27 @@
 package com.fs.tzBankPay.doman;
 
 public enum PayType {
-    账户支付("01"),
-    B2C网关("02"),
-    B2B网关("03"),
-    快捷支付("04"),
-    企业白条支付("06"),
-    e购贷支付("08"),
-    数字人民币支付("09"),
-    微信小程序支付("14"),
-    微信公众号("15"),
-    微信二维码支付("16"),
-    支付宝条码支付("27"),
-    云闪付("44"),
-    台行及村镇卡支付("45"),
-    B2B网银("46"),
-    B2C网银("47"),
-    钱包支付("48"),
-    台行及村镇企业账户支付("49"),
-    供应链白条支付("51"),
-    银联支付("53"),
-    银联签约支付("55"),
-    代付("99");
+    ACCOUNT_PAYMENT("01"),
+    B2C_GATEWAY("02"),
+    B2B_GATEWAY("03"),
+    QUICK_PAYMENT("04"),
+    ENTERPRISE_CREDIT_PAYMENT("06"),
+    E_PURCHASE_LOAN_PAYMENT("08"),
+    DIGITAL_RMB_PAYMENT("09"),
+    WECHAT_MINI_PROGRAM_PAYMENT("14"),
+    WECHAT_PUBLIC_ACCOUNT("15"),
+    WECHAT_QR_CODE_PAYMENT("16"),
+    ALIPAY_BARCODE_PAYMENT("27"),
+    CLOUD_QUICK_PASS("44"),
+    TAIWAN_AND_VILLAGE_BANK_CARD_PAYMENT("45"),
+    B2B_ONLINE_BANKING("46"),
+    B2C_ONLINE_BANKING("47"),
+    WALLET_PAYMENT("48"),
+    TAIWAN_AND_VILLAGE_ENTERPRISE_ACCOUNT_PAYMENT("49"),
+    SUPPLY_CHAIN_CREDIT_PAYMENT("51"),
+    UNIONPAY_PAYMENT("53"),
+    UNIONPAY_CONTRACT_PAYMENT("55"),
+    PAYMENT_ON_BEHALF("99");
 
     private final String code;
 
@@ -33,4 +33,3 @@ public enum PayType {
         return code;
     }
 }
-

fs-service/src/main/resources/application-common.yml

@@ -39,6 +39,8 @@ logging:
     com.fs: info
     org.springframework: warn
 
+express:
+  omsCode: "SF.0235402855"
 # Spring配置
 spring:
   cache:

fs-user-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -413,7 +413,7 @@ public class InquiryOrderController extends  AppBaseController {
                     o.setGoodsInfo("问诊订单支付"); // 订单信息
                     o.setOrderType(2);
                     o.setOrderId(order.getOrderId().toString());
-                    o.setPayType(Arrays.asList(PayType.支付宝条码支付.getCode()));
+                    o.setPayType(Arrays.asList(PayType.ALIPAY_BARCODE_PAYMENT.getCode()));
                     TzBankResult<PayCreateOrderResult> result = tzBankService.createOrder(o);
                     FsStorePayment mt=new FsStorePayment();
                     mt.setPaymentId(storePayment.getPaymentId());

fs-user-app/src/main/java/com/fs/app/controller/StoreOrderController.java

@@ -74,9 +74,6 @@ public class StoreOrderController extends  AppBaseController {
     @GetMapping("/getMyStoreOrderById")
     public R getMyStoreOrderById(@RequestParam("orderId") Long orderId, HttpServletRequest request){
         FsStoreOrder order=orderService.selectFsStoreOrderByOrderId(orderId);
-//        if(!order.getUserId().equals(Long.parseLong(getUserId()))){
-//            return R.error("非法操作");
-//        }
         order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
         order.setUserAddress(ParseUtils.parseIdCard(order.getUserAddress()));
         List<FsStoreOrderItemListUVO> list=orderItemService.selectFsStoreOrderItemListUVOByOrderId(orderId);