现金单宽+现金融合修改

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -164,16 +164,24 @@ public class DankuanController {
             } else {
                 orderView.setIPay("1");
             }
-            orderView.setCustomerId("xyzxyql");
-            orderView.setOrderCustomerType("学生");
-
+            if(product.getProductIntroductionPic3().equals("1")){
+                // 现金支付
+                orderView.setCustomerId("xjzf");   // 接入商
+            }else {
+                orderView.setCustomerId("xyzxyql");   // 接入商
+            }
+            if (StringUtils.isBlank((String) orderCustomerStudentId)) {
+                orderView.setOrderCustomerType("老师");    // 用户类别
+            } else {
+                orderView.setOrderCustomerType("学生");   // 用户类别
+            }
             ResponseData<Object> res = null;
 
             orderView.setSetMealIndex(setMealIndex);
 
             Integer insert = orderViewMapper.insert(orderView);
 
-            if (webOrderAmount.equals("0")) {
+            if (webOrderAmount.equals("0") || product.getProductIntroductionPic3().equals("1")) {
                 res = createOrder(productId,orderView, partner,filePath,"未下单");
                 Map<String,Object> map = orderMapper.selectKdOrder(orderSeq);
                 intelligenceSendOrder.singleBroadSendOrder(map);
@@ -189,6 +197,7 @@ public class DankuanController {
                 orderV.setOrderId(orderView.getOrderId());
                 orderV.setOrderSeq(orderView.getOrderSeq());
                 orderV.setWebOrderAmount(webOrderAmount);
+                orderV.setProductIntroductionPic3(product.getProductIntroductionPic3());
                 return ResponseData.success(orderV, "订单提交完成！");
             }
             return ResponseData.error("提交失败！");

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -247,12 +247,22 @@ public class RongHeController {
             } else {
                 orderView.setIPay("1"); // 支付平台
             }
-            orderView.setCustomerId("xyzxyql");   // 接入商
-            orderView.setOrderCustomerType("学生"); // 用户类别
+            if(product.getProductIntroductionPic4().equals("1")){
+                // 现金支付
+                orderView.setCustomerId("xjzf");   // 接入商
+            }else {
+                orderView.setCustomerId("xyzxyql");   // 接入商
+            }
+
+            if (StringUtils.isBlank((String) orderCustomerStudentId)) {
+                orderView.setOrderCustomerType("老师");    // 用户类别
+            } else {
+                orderView.setOrderCustomerType("学生");   // 用户类别
+            }
 
 
             ResponseData<Object> res = null;
-            if (webOrderAmount.equals("0")) {
+            if (webOrderAmount.equals("0") || product.getProductIntroductionPic4().equals("1")) {
                 res = createOrder(productId, orderView, partner, rhTime,filePath,"未下单");
                 Order order =(Order) res.getData();
                 orderV.setOrderRf2(order.getId());
@@ -273,6 +283,7 @@ public class RongHeController {
             if (insert == 1) {
                 orderV.setOrderSeq(orderSeq);
                 orderV.setWebOrderAmount(webOrderAmount);
+                orderV.setProductIntroductionPic4(product.getProductIntroductionPic4());
                 return ResponseData.success(orderV, "订单提交完成！");
             }
         }catch (Exception e){

common/src/main/java/com/winsun/bean/OrderView.java

@@ -160,4 +160,8 @@ public class OrderView implements Serializable {
     @TableField(value = "set_meal_index")
     private String setMealIndex;
 
+    @TableField(exist = false)
+    private String productIntroductionPic3;
+    @TableField(exist = false)
+    private String productIntroductionPic4;
 }
\ No newline at end of file

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -103,6 +103,7 @@ public class OrderController extends BaseController {
     private static String BUSINESS_ICCID = "iccid(必填)";
 
     private static OrderMapper orderMapper;
+    private static OrderViewMapper orderViewMapper;
 
     private static SchoolMapper schoolMapper;
 
@@ -522,9 +523,10 @@ public class OrderController extends BaseController {
             }
             sf.append(",重新上传学生证");
         }
-        Wrapper wrapper = new EntityWrapper<>();
+        Wrapper<Order> wrapper = new EntityWrapper<>();
         wrapper.eq("id", id);
         Map<String, Object> dataMapping = new HashMap<>();
+        dataMapping.put("update_time",new Date());
         if(StringUtils.isNoneBlank(student_number) && !student_number.equals(hhrOrderId.get(0).get("student_number"))){
             dataMapping.put("student_number",student_number);
             sf.append(",用户学号由"+order.get("student_number")+"修改为"+student_number);