1、创建红包订单问题处理

fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -3312,12 +3312,12 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 return R.error("订单生成失败，请重试");
             }
             LiveOrderPayment storePayment = liveOrderPaymentMapper.selectByBuissnessId(liveOrder.getOrderId());
-            storePayment.setAppId(liveOrder.getAppId());
             if (storePayment != null) {
                 storePayment.setStatus(1);
                 liveOrderPaymentMapper.updateLiveOrderPayment(storePayment);
             } else {
                 storePayment = new LiveOrderPayment();
+                storePayment.setAppId(liveOrder.getAppId());
                 storePayment.setStatus(1);
                 storePayment.setPayMode(merchantAppConfig.getMerchantType());
                 storePayment.setBusinessCode(liveOrder.getOrderCode());
@@ -3805,7 +3805,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
         if (order.getPayType().equals("3") && order.getPayMoney().compareTo(BigDecimal.ZERO) <= 0) {
             this.payConfirm(2, order.getOrderId(), null, null, null, null);
-            return R.ok().put("payType", param.getOrderPayType()).put("isPay", 1);
+            return R.ok().put("payType", param.getPayType()).put("isPay", 1);
         }
 
         if (order.getPayMoney().compareTo(BigDecimal.ZERO) <= 0) {
@@ -3906,12 +3906,8 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 mt.setAppId(appId);
                 liveOrderPaymentMapper.updateLiveOrderPayment(mt);
                 redisCache.setCacheObject("isPaying:" + order.getOrderId(), order.getOrderId().toString(), 1, TimeUnit.MINUTES);
-                Map<String, Object> resultMap = JSON.parseObject(result.getPay_info(), new TypeReference<Map<String, Object>>() {
-                });
-                if (resultMap != null && resultMap.get("package") != null) {
-                    resultMap.put("packageValue", resultMap.get("package"));
-                }
-                return R.ok().put("payType", param.getOrderPayType()).put("data", resultMap).put("type", "hf").put("isPay", 0);
+
+                return R.ok().put("payType", param.getOrderPayType()).put("data", result).put("type", "hf").put("isPay", 0);
             }
             return R.error(result.getResp_desc());
         } else if ("appPay".equals(merchantAppConfig.getMerchantType()) && "wx".equals(param.getPayType())) {