jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxJsjpController.java

@@ -403,7 +403,12 @@ public class WxJsjpController extends BaseController {
             order.setIsFz(0); //不分账
         }
 
-        order.setGoodsType(1);
+        if(wxOrderDTO.getGoodsType()!=null) {
+            order.setGoodsType(wxOrderDTO.getGoodsType());
+        } else {
+            order.setGoodsType(1);
+        }
+
         order.setPhoneType(wxOrderDTO.getPhoneType());  //手机类型
         if ("yntms".equals(gzptUserInfo.getCity())) { //如果是一诺地市
             order.setDqbh(gzptUserInfo.getCountry().substring(0,4));

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java

@@ -131,6 +131,8 @@ public class WxNotifyController {
             orderInfoService.writeVipDataToDb(wxJsOrder,1);
         }else if(wxJsOrder.getGoodsType()==2) { //考场
             orderInfoService.writeExamDataToDb(wxJsOrder,1);
+        }else if(wxJsOrder.getGoodsType()==4) {
+            orderInfoService.writeVipDataToDb(wxJsOrder,1);
         }
         wxJsOrderService.updateById(wxJsOrder);
 

jsjp-admin/src/main/resources/application-dev.yml

@@ -147,8 +147,10 @@ wxpay:
     serialNumber: 53EBF541F383371B121D7B57B25305FC0BB04F42
     platformSerialNumber: 3BC2D5BB3089545297F9CC9BFF94FA4EE7602B69
     v3key: 7hM14893GvG3JK05575jk1l6P4tF042B
-    notifyUrl: https://jsjp-admin1.zzxcx.net/stage-api/open-api/wx/notify/wxpay
-    notifyUrlRefund: https://jsjp-admin1.zzxcx.net/stage-api/wx/notify/refund
+    notifyUrl: https://bbq.natapp4.cc/open-api/wx/notify/wxpay
+    notifyUrlRefund: https://bbq.natapp4.cc/open-api/wx/notify/refund
+    #notifyUrl: https://jsjp-admin1.zzxcx.net/stage-api/open-api/wx/notify/wxpay
+    #notifyUrlRefund: https://jsjp-admin1.zzxcx.net/stage-api/wx/notify/refund
     #notifyUrl: https://1a0j71808.imdo.co/open-api/wx/notify/wxpay
     #notifyUrlRefund: https://1a0j71808.imdo.co/open-api/wx/notify/refund
 

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -1051,7 +1051,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         orderInfo.setSuccessTime(order.getSuccessTime());
         orderInfo.setPayType(payType);
         orderInfo.setPhoneType(order.getPhoneType());
-        orderInfo.setPayType(payType);
         orderInfo.setDqbh(order.getDqbh());
         orderInfo.setDqmc(order.getDqmc());
         orderInfo.setSchool(order.getSchool());
@@ -2077,7 +2076,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 vipUserExamService.deleteVipUserExamByUserIdAndGoodsId(order.getUserId(), order.getGoodsId());
                 System.out.println("退未取消考场");
                 break;
-            case 5:
+            case 4:
                 if ("科一特训包".equals(order.getGoodsName())) {
                     UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
                     if (userVip != null) {