支付走商城

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

@@ -1204,6 +1204,9 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
                                 request.setOrdAmt(payment.getPayMoney().setScale(2, RoundingMode.DOWN).toString());
                             }
                             extendInfoMap.put("org_req_seq_id", "store-"+payment.getPayCode());
+                            if("北京卓美".equals(companyName) && order.getOrderType() != null && 2 == order.getOrderType()){
+                                extendInfoMap.put("org_req_seq_id", "live-"+payment.getPayCode());
+                            }
                         }else {
                             if("北京卓美".equals(companyName)){
                                 request.setOrdAmt(refundAmount.setScale(2, RoundingMode.DOWN).toString());

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

@@ -354,7 +354,7 @@ public class MergedOrderServiceImpl implements IMergedOrderService
             return R.error("订单类型不能为空");
         }
 
-        if (orderType == 1) {
+        if (orderType == 0) {
             // 商城订单
             com.fs.hisStore.domain.FsStoreOrderScrm storeOrder = storeOrderService.selectFsStoreOrderById(orderId);
             if (storeOrder == null) {