Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-company-app/src/main/java/com/fs/app/controller/UserController.java

@@ -13,6 +13,7 @@ import com.fs.app.vo.UserPostVO;
 import com.fs.app.vo.UserVO;
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.config.FSConfig;
+import com.fs.common.constant.FsConstants;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.ServiceException;
@@ -263,7 +264,13 @@ public class UserController extends AppBaseController {
             companyUser.setCompanyName(company.getCompanyName());
             // 岗位
             companyUser.setPosts(postService.selectCompanyPostListByUserId(companyUser.getUserId()));
-            return R.ok().put("user", companyUser).put("balance", company.getMoney());
+            String companyMoneyKey = FsConstants.COMPANY_MONEY_KEY + company.getCompanyId();
+            String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+            BigDecimal money = new BigDecimal(0);
+            if (StringUtils.isNotEmpty(moneyStr)) {
+                money =new BigDecimal(moneyStr);
+            }
+            return R.ok().put("user", companyUser).put("balance",money);
         } catch (Exception e) {
 
             return R.error("操作异常");

fs-service/src/main/java/com/fs/erp/service/impl/JstTokenService.java

@@ -168,7 +168,7 @@ public class JstTokenService {
      * 根据文档说明，刷新token必须在有效期小于15天时进行，所以这里设置20天刷新一次
      */
 //    @Scheduled(fixedRate = 20 * 24 * 60 * 60 * 1000)
-    @Scheduled(cron = "0 0 3 */28 * ?")
+//    @Scheduled(cron = "0 0 3 */28 * ?")
     public void scheduleTokenRefresh() {
         log.info("定时任务：刷新聚水潭API令牌");
         try {

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserScrmServiceImpl.java

@@ -188,6 +188,7 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
     public int insertFsUser(FsUserScrm fsUser)
     {
         fsUser.setCreateTime(DateUtils.getNowDate());
+        log.info("进行新增参数：fsUser={}",fsUser);
         return fsUserMapper.insertFsUser(fsUser);
     }
 
@@ -207,6 +208,7 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
             }
         }
         fsUser.setUpdateTime(DateUtils.getNowDate());
+        log.info("进行修改参数：fsUser={}",fsUser);
         return fsUserMapper.updateFsUser(fsUser);
     }
 

fs-user-app/src/main/java/com/fs/app/controller/store/WxCompanyUserScrmController.java

@@ -170,7 +170,7 @@ public class WxCompanyUserScrmController extends AppBaseController {
      */
     private FsUserScrm createUser(LoginMaWxParam param, WxMaJscode2SessionResult session, WxMaPhoneNumberInfo phoneNoInfo, Company company, CompanyUser companyUser) {
         FsUserScrm user = new FsUserScrm();
-        user.setStatus((company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1);
+        user.setStatus(1);
         user.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
         user.setCreateTime(new Date());
         if (param.getAuthType() == 1 && phoneNoInfo != null) {

fs-user-app/src/main/java/com/fs/app/controller/store/WxCompanyUserScrmControllerCopy.java

@@ -139,7 +139,7 @@ public class WxCompanyUserScrmControllerCopy extends AppBaseController {
                     user = new FsUserScrm();
 //                    user.setNickname(param.getNickname() != null ? param.getNickname() : "微信用户");
 //                    user.setAvatar(param.getAvatar() != null ? param.getAvatar() : null);
-                    user.setStatus((company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1);
+                    user.setStatus(1);
                     user.setMaOpenId(session.getOpenid());
                     user.setUnionId(session.getUnionid());
                     user.setCreateTime(new Date());

fs-user-app/src/main/java/com/fs/app/controller/store/WxH5MpScrmController.java

@@ -156,7 +156,7 @@ public class WxH5MpScrmController {
 //            newUser.setCompanyUserId(companyUser.getUserId());
             newUser.setUnionId(wxMpUser.getUnionId());
             newUser.setCreateTime(new Date());
-            newUser.setStatus(company != null && company.getFsUserIsDefaultBlack() == 1 ? 0 : 1);
+            newUser.setStatus(1);
             userService.insertFsUser(newUser);
 
             return newUser;