fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -996,6 +996,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 if("广州郑多燕".equals(cloudHostProper.getCompanyName())){
                     BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + param.getCreateOrderKey());
                     storeOrder.setPayDelivery(amount != null ? amount : BigDecimal.ZERO);
+//                    storeOrder.setPayType(storeOrder.getPayPrice().compareTo(storeOrder.getTotalPrice()) == 0 ?"1":"5");
+//                    logger.info("订单创建--------实际支付金额和总金额：{},{}，", storeOrder.getPayPrice(), storeOrder.getTotalPrice());
                 }
             } else if (param.getPayType().equals("2")) {
                 //物流代收
@@ -1776,6 +1778,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             if("广州郑多燕".equals(cloudHostProper.getCompanyName())){
                 BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + param.getOrderKey());
                 storeOrder.setPayDelivery(amount != null ? amount : BigDecimal.ZERO);
+//                storeOrder.setPayType(storeOrder.getPayPrice().compareTo(storeOrder.getTotalPrice()) == 0 ?"1":"5");
+//                logger.info("套餐包制单---------实际支付金额和总金额：{},{}，", storeOrder.getPayPrice(), storeOrder.getTotalPrice());
             }
             storeOrder.setIsPackage(1);
             FsStoreProductPackageScrm productPackage = new FsStoreProductPackageScrm();
@@ -4300,6 +4304,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     order.setPayMoney(order.getPayPrice());
                     if(!"广州郑多燕".equals(cloudHostProper.getCompanyName())){
                         order.setPayDelivery(BigDecimal.ZERO);
+                    }else {
+                        // 郑多燕单独设置支付类型
+                        order.setPayType(order.getPayPrice().compareTo(order.getTotalPrice()) == 0 ?"1":"5");
+                        logger.info("支付------------实际支付金额和总金额：{},{}，", order.getPayPrice(), order.getTotalPrice());
                     }
                 }
                 else if(param.getPayType().equals(2)){
@@ -4338,7 +4346,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 this.updateFsStoreOrder(order);
             }
             String payCode =  OrderCodeUtils.getOrderSn();
-            if((order.getPayType().equals("1")||order.getPayType().equals("2")||order.getPayType().equals("3")) && order.getPayMoney().compareTo(new BigDecimal(0))>0){
+            if((order.getPayType().equals("1")||order.getPayType().equals("2")||order.getPayType().equals("3")||order.getPayType().equals("5")) && order.getPayMoney().compareTo(new BigDecimal(0))>0){
                 String json = configService.selectConfigByKey(STORE_PAY_CONF);
                 FsPayConfigScrm fsPayConfig = JSON.parseObject(json, FsPayConfigScrm.class);
                 FsStorePaymentScrm storePayment=new FsStorePaymentScrm();
@@ -4816,6 +4824,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     if(!"广州郑多燕".equals(cloudHostProper.getCompanyName())){
                         order.setPayDelivery(BigDecimal.ZERO);
                     }
+//                    else {
+//                        // 郑多燕单独设置支付类型
+//                        order.setPayType(order.getPayPrice().compareTo(order.getTotalPrice()) == 0 ?"1":"5");
+//                        logger.info("修改价格--------实际支付金额和总金额：{},{}，", order.getPayPrice(), order.getTotalPrice());
+//                    }
                 }
                 else if(param.getPayType().equals(2)){
                     // 物流代收