Merge remote-tracking branch 'origin/master'

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

@@ -340,7 +340,7 @@ public class RongHeController {
             School school = schoolMapper.selectById(schoolId);
             order.setHehuorenSchool(school.getSchoolName());
             order.setHehuorenName(sysUser.getName());
-            order.setPackageId(productId);
+//            order.setPackageId(productId);
             order.setHehuorenArea(school.getSubName());
             order.setSignImg(filePath);
             List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);

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

@@ -58,7 +58,7 @@ public class SupervisorController {
         if (map.size() == 0) {
             return ResponseData.error("当前订单不存在！");
         }
-        if (map.get("packageId") != null) {
+        if (map.get("packageId") != null && map.get("kapin") != "融合办理") {
             Package aPackage = packageMapper.selectById(Integer.parseInt(map.get("packageId").toString()));
             map.put("packageName", aPackage.getPackageName());
             map.put("advImg", aPackage.getAdvImg());

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

@@ -178,8 +178,11 @@ public class codeManagerController {
         wrapper.eq("is_show","1");
         List<Regular> regulars = regularMapper.selectList(wrapper);
 //        Regular regulars = regularMapper.selectById(regularId);
+        if(regulars !=null && regulars.size()>0){
             return ResponseData.success(regulars.get(0), "查询成功！");
         }
+        return ResponseData.success();
+    }
     //检查学生证号是否在学生清单内
     @ResponseBody
     @RequestMapping(value="queryStuNo", method = RequestMethod.POST)

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

@@ -55,15 +55,6 @@ public class NetworkPlaceController extends BaseController {
     private static final int SHEET_INDEX = 0;
 
 
-//    	headMap.put("网点编码（必填）", "networkCode");
-//		headMap.put("网点名（必填）", "networkName");
-//		headMap.put("学校（必填）", "schoolName");
-//		headMap.put("县分（必填）", "areaName");
-//		headMap.put("前置开始时间", "springStartTime");
-//		headMap.put("开学时间", "springEndTime");
-//		headMap.put("充值大于50奖励", "greaterFifty");
-//		headMap.put("充值大于100奖励", "greaterHundred");
-
 
     private static String NETWORK_CODE = "网点编码（必填）";
     private static String NETWORK_NAME = "网点名（必填）";

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

@@ -19,6 +19,7 @@ import com.winsun.constant.FilePath;
 import com.winsun.mapper.*;
 import com.winsun.rabbitmq.RabbitProducer;
 import com.winsun.service.IHhrUserService;
+import com.winsun.service.ISalesListService;
 import com.winsun.smsUtils.SendSmsAndMail;
 import com.winsun.utils.Constant;
 import com.winsun.utils.*;
@@ -138,6 +139,9 @@ public class OrderController extends BaseController {
     @Autowired
     private IHhrUserService hhrUserService;
 
+    @Autowired
+    private ISalesListService salesListService;
+
     private InputStream in = this.getClass().getResourceAsStream("/txtfiledetail.properties");
     private Properties prop = new Properties();
 
@@ -2193,6 +2197,7 @@ public class OrderController extends BaseController {
     public void insertCompleteOrder(Order order){
         try{
             SysUser sysUser = sysUserMapper.selectById(order.getHehuorenId());
+            ShiroUser user = getShiroUser();
             Date date = new Date();
             SalesList salesOrder = new SalesList();
             salesOrder.setOrderPhone(order.getBusinessNumber());
@@ -2207,9 +2212,23 @@ public class OrderController extends BaseController {
             salesOrder.setOldCombo(order.getKapin());
             salesOrder.setDelFlag("0");
             salesOrder.setLockState("否");
-            log.info("新用户完成存销售清单:"+salesOrder);
+
+            salesOrder.setPreType("");
+
+            salesOrder.setMonthAmount(0D);
+            salesOrder.setMonthBonus(0D);
+            salesOrder.setNonSendBonus(0D);
+            salesOrder.setSendBonus(0D);
+            salesOrder.setAllBonus(0D);
+
+
             salesOrder.setAccount(sysUser.getAccount());
-            salesListMapper.insert(salesOrder);
+            log.info("新用户完成存销售清单:"+salesOrder);
+            ResponseData<String> stringResponseData = salesListService.addSalesList(salesOrder);
+            if(stringResponseData.getState() != null && "error".equals(stringResponseData.getState())){
+                appMapper.inserOrderHis(order.getOrderId(), "新用户完成存销售清单:"+stringResponseData.getMsg(), new Date(), user.getName());
+            }
+            log.info("新用户完成存销售清单:"+order.getOrderId()+":"+stringResponseData);
         }catch (Exception e){
             e.printStackTrace();
         }

task/src/main/java/com/winsun/TimingTask/OrderTask.java

@@ -4,15 +4,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.bean.Order;
 import com.winsun.bean.OrderHistory;
 import com.winsun.bean.SalesList;
 import com.winsun.bean.SysUser;
-import com.winsun.mapper.OrderHistoryMapper;
-import com.winsun.mapper.OrderMapper;
-import com.winsun.mapper.SalesListMapper;
-import com.winsun.mapper.SysUserMapper;
+import com.winsun.mapper.*;
 import com.winsun.outSideSystem.IntelligenceSendOrder;
+import com.winsun.service.ISalesListService;
 import com.winsun.smsUtils.SendSmsAndMail;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
 import com.winsun.utils.XbkUtil;
@@ -51,6 +51,11 @@ public class OrderTask {
     private SalesListMapper salesListMapper;
 
     @Autowired
+    private AppMapper appMapper;
+
+    @Autowired
+    private ISalesListService salesListService;
+    @Autowired
     public OrderTask(OrderMapper orderMapper) {
         OrderTask.orderMapper = orderMapper;
     }
@@ -252,15 +257,29 @@ public class OrderTask {
             salesOrder.setStatus("1");
             salesOrder.setSalesSubst(order.getHehuorenArea());
             salesOrder.setName(order.getHehuorenName());
-            salesOrder.setAccount(sysUser.getAccount());
             salesOrder.setOrderType(order.getUserType());
             salesOrder.setOrderNum(order.getOrderNumber());
             salesOrder.setOldCombo(order.getKapin());
             salesOrder.setDelFlag("0");
             salesOrder.setLockState("否");
-            log.info("新用户完成存销售清单："+salesOrder);
-            salesListMapper.insert(salesOrder);
-        }catch(Exception e){
+
+            salesOrder.setPreType("");
+
+            salesOrder.setMonthAmount(0D);
+            salesOrder.setMonthBonus(0D);
+            salesOrder.setNonSendBonus(0D);
+            salesOrder.setSendBonus(0D);
+            salesOrder.setAllBonus(0D);
+
+
+            salesOrder.setAccount(sysUser.getAccount());
+            log.info("新用户完成存销售清单:"+salesOrder);
+            ResponseData<String> stringResponseData = salesListService.addSalesList(salesOrder);
+            if(stringResponseData.getState() != null && "error".equals(stringResponseData.getState())){
+                appMapper.inserOrderHis(order.getOrderId(), "新用户完成存销售清单:"+stringResponseData.getMsg(), new Date(), "");
+            }
+            log.info("新用户完成存销售清单:"+order.getOrderId()+":"+stringResponseData);
+        }catch (Exception e){
             e.printStackTrace();
         }
     }