首页订单量错误问题，审核中订单显示未支付问题，缺少优惠购机字段问题

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

@@ -361,26 +361,14 @@ public class codeManagerController {
                 Wrapper<OrderView> wrapper = new EntityWrapper<>();
                 wrapper.eq(StringUtils.isNotBlank(order.get(0).getKdOrderId()), "orderSeq", order.get(0).getKdOrderId());
                 List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
-                if("0".equals(orderViews.get(0).getWebOrderAmount())){
-                    mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
-                    mapData.put("userType", order.get(0).getUserType());
-                    mapData.put("kapin", order.get(0).getKapin());
-                    mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
-                    return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
-                }
-                if (orderViews.get(0).getUptranseq()==null ||
-                        StringUtils.isBlank(orderViews.get(0).getUptranseq())) {
+
+                if ("未支付".equals(order.get(0).getOrderStatus())) {
                     mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
                     mapData.put("userType", order.get(0).getUserType());
                     mapData.put("kapin", order.get(0).getKapin());
-                    if("3".equals(order.get(0).getUserType())||"5".equals(order.get(0).getUserType())){
-                        mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面"
-                    }else {
-                        mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
-                        return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
-                    }
-                    return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面");
-                }else {
+                    mapData.put("code", 2);
+                    return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面，若已支付，请等待支付状态更新");
+                }else{
                     mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
                     mapData.put("userType", order.get(0).getUserType());
                     mapData.put("kapin", order.get(0).getKapin());

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

@@ -121,6 +121,12 @@ public class School implements Serializable {
 	private String isShowrh;
 
 	/**
+	 * 是否显示优惠购机
+	 */
+	@TableField("is_showyhgj")
+   	private String isShowyhgj;
+
+	/**
 	 * 是否显示毕业生融合办理
 	 */
    	@TableField("bysrh" )

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

@@ -592,9 +592,9 @@ public class PackageNewClothes {
         if (age < time16) {
             return ResponseData.error("根据工信部要求,未满16周岁的用户,应由法定代理人代为办理线上入网,如有疑问请联系客服,谢谢。");
         }
-        if (age > time25) {
-            return ResponseData.error("您已满25周岁,不符合办理条件,如有疑问请联系客服,谢谢。");
-        }
+//        if (age > time25) {
+//            return ResponseData.error("您已满25周岁,不符合办理条件,如有疑问请联系客服,谢谢。");
+//       }
         return ResponseData.success("OK");
     }
 

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

@@ -99,10 +99,17 @@ public class AnalysisController extends BaseController {
         
         // 获取本周
         int i = weekDate.get(Calendar.DAY_OF_WEEK);
-        weekDate.add(Calendar.DATE, -8 + i);
+        if(weekDate.get(Calendar.DAY_OF_WEEK) != 1) {
+            weekDate.add(Calendar.DATE, 2 - weekDate.get(Calendar.DAY_OF_WEEK));
+        }else{
+            weekDate.add(Calendar.DATE, weekDate.get(Calendar.DAY_OF_WEEK) - 7);
+        }
         toWeekStart = sdf.format(weekDate.getTime());
         weekDate.add(Calendar.DATE, 7);
         toWeekEnd = sdf.format(weekDate.getTime());
+
+        log.info("周开始时间：" + toWeekStart);
+        log.info("周结束时间：" + toWeekEnd);
         
         // 获取当月
         nowDate.set(Calendar.DATE, 1);