分账处理

nbjk-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java

@@ -264,9 +264,10 @@ public class WxController extends BaseController {
             order.setUnionId(userInfo.getUnionId());
             order.setPhoneType(wxOrderDTO.getPhoneType()); //手机类型 1:苹果 2:安卓
             order.setForeType(wxOrderDTO.getForeType()); //前端类型 1:app 2:小程序 3:公众号
-            if(wxOrderDTO.getForeType()==2) {
-                order.setProfitSharing(1); //待分账
-            }
+//            if(wxOrderDTO.getForeType()==2) {
+//                order.setProfitSharing(1); //待分账
+//            }
+            order.setProfitSharing(0); //待分账
             order.setTotal(examInfo.getPrice());
             order.setOrderStatus(OrderStatusEnum.PROCESSING.getCode());
             wxOrderService.save(order);
@@ -297,7 +298,7 @@ public class WxController extends BaseController {
 //            if(wxOrderDTO.getForeType()==2) {
 //                order.setProfitSharing(1); //待分账
 //            }
-            order.setProfitSharing(1); //待分账
+            order.setProfitSharing(0); //待分账
             order.setOrderStatus(OrderStatusEnum.PROCESSING.getCode());
             wxOrderService.save(order);
             return Response.success(placeXcxWxOrder(order, "八字排盘"));
@@ -326,9 +327,9 @@ public class WxController extends BaseController {
                 .put("out_trade_no", order.getOutTradeNo());
         rootNode.putObject("amount").put("total", order.getTotal());
         rootNode.putObject("payer").put("openid", order.getXcxOpenid());
-        if("八字排盘".equals(goodsName)) {
-            rootNode.putObject("settle_info").put("profit_sharing", true);
-        }
+//        if("八字排盘".equals(goodsName)) {
+//            rootNode.putObject("settle_info").put("profit_sharing", true);
+//        }
         objectMapper.writeValue(bos, rootNode);
         httpPost.setEntity(new StringEntity(rootNode.toString(), "utf-8"));
         HttpResponse response = httpClient.execute(httpPost);

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

@@ -210,12 +210,12 @@ public class WxNotifyController {
 
         orderInfoService.writeVipDataToDb(wxOrder,payType);
 
-        try {
-            wxOrderService.wxAddFenZhang();  //添加分账用户
-            wxOrderService.wxProfitsharing(wxOrder);  //进行分账
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+//        try {
+//            wxOrderService.wxAddFenZhang();  //添加分账用户
+//            wxOrderService.wxProfitsharing(wxOrder);  //进行分账
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
 
         wxOrderService.updateById(wxOrder);