1

hai-cweb/src/main/java/com/cweb/controller/WechatController.java

@@ -353,9 +353,8 @@ public class WechatController {
                 // 1：需要填写用户信息
                 // 2：需要填写手机号
                 user.setInfoCompleteStatus(1);
-
-            }
-
+                return ResponseMsgUtil.success(user);
+            } else {
                 // 定义个人所有数据
                 HighUserModel highUserModel = new HighUserModel();
                 HighUser detailData = highUserService.getDetailDataByUser(user.getId());
@@ -364,6 +363,9 @@ public class WechatController {
                 SessionObject so = new SessionObject(user.getPhone(), 1, highUserModel);
                 userCenter.save(request, response, so);
                 return ResponseMsgUtil.success(so);
+            }
+
+
 
         } catch (Exception e) {
             return ResponseMsgUtil.exception(e);

hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java

@@ -247,6 +247,7 @@ public class CzOrderController {
                 childOrder.setStatus(101);
                 rechargeOrder.setRechargeStatus(202);
                 rechargeOrder.setPayStatus(100);
+                rechargeOrder.setFinishTime(new Date());
 
                 outRechargeOrderService.updateOrder(rechargeOrder);
                 outRechargeChildOrderService.updateOrder(childOrder);