导出字段修复+找回密码排除超管账号+天翼增加自配字段标识

core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java

@@ -365,12 +365,9 @@ public class LoginPwdController extends BaseController {
         //5分钟内有效
         //5分钟内有效
         String code = username + CODE;
         String code = username + CODE;
         String verificationCode = null;
         String verificationCode = null;
-        if (username.equals("admin")) {
-            //只有admin验证码有后门 验证码规则：当前月份日期小时例如 011415
-            verificationCode = DateUtil.formatDate(new Date(), "MMddHH");
-        } else {
-            verificationCode = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
-        }
+
+        verificationCode = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
+
 
 
         Long expire = stringRedisTemplate.getExpire(code);
         Long expire = stringRedisTemplate.getExpire(code);
         //验证码 有效时间是五分钟倒计时
         //验证码 有效时间是五分钟倒计时
@@ -381,20 +378,15 @@ public class LoginPwdController extends BaseController {
         Map<String, Object> sent = new HashMap<>();
         Map<String, Object> sent = new HashMap<>();
         sent.put("code", 400);
         sent.put("code", 400);
         try {
         try {
-            if (username.equals("admin")) {
+            if (user.getPhone().length() == 11) {
+                SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
                 sent.put("message", "操作成功");
                 sent.put("message", "操作成功");
-//                sent.put("message", "发送成功");
+//                    sent.put("message", "发送成功");
                 sent.put("code", 200);
                 sent.put("code", 200);
             } else {
             } else {
-                if (user.getPhone().length() == 11) {
-                    SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
-                    sent.put("message", "操作成功");
-//                    sent.put("message", "发送成功");
-                    sent.put("code", 200);
-                } else {
-                    sent.put("message", "当前用户手机号码不合法！");
-                }
+                sent.put("message", "当前用户手机号码不合法！");
             }
             }
+
         } catch (Exception e) {
         } catch (Exception e) {
             log.info("错误信息：{}" + e.getMessage(), e);
             log.info("错误信息：{}" + e.getMessage(), e);
             sent.put("message", "手机短信发送失败");
             sent.put("message", "手机短信发送失败");

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -412,6 +412,7 @@ public class PackageNewClothes {
         order.setIdCardf(PicturesUtil.uploadPictures(idCardf, orderNum,PATHTYPE));
         order.setIdCardf(PicturesUtil.uploadPictures(idCardf, orderNum,PATHTYPE));
 
 
         order.setSignImg(PicturesUtil.uploadPictures(signUrl, orderNum, "signImg"));
         order.setSignImg(PicturesUtil.uploadPictures(signUrl, orderNum, "signImg"));
+        order.setIsDelivery("2");
         order.setRemarks(remarks);
         order.setRemarks(remarks);
         order.setClassNumber(classNumber);
         order.setClassNumber(classNumber);
         order.setParentName(parentName);
         order.setParentName(parentName);
@@ -497,7 +498,7 @@ public class PackageNewClothes {
 
 
 
 
         /**
         /**
-         * TODO 待识别订单返回进入旧订单入口
+         * 待识别订单返回进入旧订单入口
          */
          */
         Map<String, Object> mapData = new HashMap<>();
         Map<String, Object> mapData = new HashMap<>();
         Wrapper<Order> wrapper = new EntityWrapper();
         Wrapper<Order> wrapper = new EntityWrapper();
@@ -592,7 +593,7 @@ public class PackageNewClothes {
             return ResponseData.error("小白卡下单失败,如有疑问请联系客服,谢谢。");
             return ResponseData.error("小白卡下单失败,如有疑问请联系客服,谢谢。");
         }
         }
         if (!"0".equals(jsonObject.getString("code"))) {
         if (!"0".equals(jsonObject.getString("code"))) {
-            return ResponseData.error("省合伙人:"+jsonObject.getString("msg"));
+            return ResponseData.error("提交失败:"+jsonObject.getString("msg"));
         }
         }
         Map<String, Object> map = JSON.parseObject(jsonObject.getString("dataArray"), HashMap.class);
         Map<String, Object> map = JSON.parseObject(jsonObject.getString("dataArray"), HashMap.class);
 
 

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

@@ -873,7 +873,7 @@ public class OrderController extends BaseController {
         EntityWrapper<Order> wrapper = new EntityWrapper();
         EntityWrapper<Order> wrapper = new EntityWrapper();
         wrapper.setSqlSelect("customer_name, business_number, order_status, create_time, " +
         wrapper.setSqlSelect("customer_name, business_number, order_status, create_time, " +
                 "hehuoren_id,hehuoren_area, hehuoren_school, hehuoren_name, hehuoren_phone, " +
                 "hehuoren_id,hehuoren_area, hehuoren_school, hehuoren_name, hehuoren_phone, " +
-                "supervisor_name, user_type, kapin, business_package, contact_number, order_number, xb_order_id, site, address, " +
+                "supervisor_name, user_type, kapin, business_package, contact_number, order_number, xb_order_id, order_id, site, address, " +
                 "is_delivery, company, kuaidi_order, business_iccid, kuaidi_time, success_time, userSchool, student_card_check_status, " +
                 "is_delivery, company, kuaidi_order, business_iccid, kuaidi_time, success_time, userSchool, student_card_check_status, " +
                 "parent_name, student_number, class_number");
                 "parent_name, student_number, class_number");
         wrapper.notIn( "user_type", "3,5,9,10");
         wrapper.notIn( "user_type", "3,5,9,10");