'提交代码'

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

@@ -72,7 +72,7 @@ public class HighCouponController {
             BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(regionId);
             if (bsCompany != null) {
                 Map<String, Object> map = new HashMap<>();
-                map.put("companyId", bsCompany.getRegionId());
+                map.put("companyId", bsCompany.getId());
                 map.put("merchantId", merchantId);
                 map.put("couponName", couponName);
                 map.put("couponType", couponType);

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

@@ -135,6 +135,7 @@ public class WechatController {
                 user.setOpenId(openId);
                 user.setRegTime(new Date());
                 user.setStatus(1);
+                user.setGold(0);
                 user.setPhone(phoneNoInfo.getPurePhoneNumber());
                 highUserService.insertUser(user);
             } else {
@@ -154,6 +155,7 @@ public class WechatController {
 
         } catch (Exception e) {
             return ResponseMsgUtil.exception(e);
+
         }
     }
 
@@ -189,6 +191,7 @@ public class WechatController {
                 user.setOpenId(openId);
                 user.setRegTime(new Date());
                 user.setStatus(1);
+                user.setGold(0);
                 user.setHeaderImg(userInfo.getAvatarUrl());
                 user.setName(userInfo.getNickName());
                 highUserService.insertUser(user);