修改直播状态

fs-company/src/main/java/com/fs/company/controller/live/LiveController.java

@@ -314,9 +314,9 @@ public class LiveController extends BaseController
         String url="https://api.weixin.qq.com/cgi-bin/stable_token";
         HashMap<String, String> map = new HashMap<>();
         map.put("grant_type","client_credential");
-        // 芳华惠选
-        map.put("appid","wx503cf8ab31f83dd4");
-        map.put("secret","1ba1972363889dcb4a37ecb685744435");
+        // 百域承品
+        map.put("appid","wx44beed5640bcb1ba");
+        map.put("secret","1bfcfa420f741801575a74d94752d014");
         String accessToken = HttpUtils.endApi(url, null, map);
         // 创建Gson对象
         Gson gson = new Gson();

fs-service/src/main/java/com/fs/live/param/LiveOrderPayParam.java

@@ -21,4 +21,5 @@ public class LiveOrderPayParam implements Serializable
      * 小程序多商城
      * **/
     private String appId;
+    private Integer payPirce;
 }

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

@@ -1525,7 +1525,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         liveOrder.setUpdateTime(new Date());
         liveOrder.setPayDelivery(deliveryMoney);
         liveOrder.setProductId(fsStoreProduct.getProductId());
-        liveOrder.setStatus(OrderInfoEnum.STATUS_1.getValue());
+        liveOrder.setStatus(OrderInfoEnum.STATUS_0.getValue());
         liveOrder.setPayType("1");
         liveOrder.setTotalPrice(totalPrice);
         liveOrder.setPayMoney(BigDecimal.ZERO);
@@ -2509,7 +2509,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             return R.error("订单状态不正确");
         }
         String orderId=redisCache.getCacheObject("isPaying:"+order.getOrderId());
-        if(StringUtils.isNotEmpty(orderId)&&orderId.equals(order.getOrderId().toString())){
+        if(StringUtils.isNotEmpty(orderId)&&order.getOrderId().toString().equals(orderId)){
             return R.error("正在支付中...");
         }
 
@@ -2728,10 +2728,11 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         liveOrder.setUpdateTime(new Date());
         liveOrder.setPayDelivery(deliveryMoney);
         liveOrder.setProductId(fsStoreProduct.getProductId());
-        liveOrder.setStatus(OrderInfoEnum.STATUS_1.getValue());
+        liveOrder.setStatus(OrderInfoEnum.STATUS_0.getValue());
         liveOrder.setPayType("1");
         liveOrder.setTotalPrice(payPrice);
-        liveOrder.setPayMoney(liveOrder.getTotalPrice().subtract(liveOrder.getDiscountMoney()));
+        liveOrder.setPayMoney(BigDecimal.ZERO);
+        liveOrder.setPayPrice(liveOrder.getTotalPrice().subtract(liveOrder.getDiscountMoney()));
         try {
             if (baseMapper.insertLiveOrder(liveOrder) > 0) {
                 LiveOrderItemDTO dto=new LiveOrderItemDTO();