修复代码

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java

@@ -36,7 +36,7 @@ import org.jeecg.common.util.oConvertUtils;
 public class JwtUtil {
 
 	/**Token有效期为1小时（Token在reids中缓存时间为两倍）*/
-	public static final long EXPIRE_TIME = 60 * 60 * 1000;
+	public static final long EXPIRE_TIME = 600 * 600 * 1000;
 	static final String WELL_NUMBER = SymbolConstant.WELL_NUMBER + SymbolConstant.LEFT_CURLY_BRACKET;
 
     /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/bean/TechnicianPageBean.java

@@ -11,6 +11,9 @@ public class TechnicianPageBean {
     @ApiModelProperty(value = "技师名称" )
     private String title;
 
+    @ApiModelProperty(value = "地区标识" )
+    private String county;
+
     /**显示条数*/
     @ApiModelProperty(value = "显示条数" )
     private Integer pageSize;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/OrderCreateVipServiceImpl.java

@@ -1254,6 +1254,10 @@ public class OrderCreateVipServiceImpl implements OrderCreateVipService {
     public Result<?> giveWithdrawal(String token, WithdrawalBean bean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
         BigDecimal price = bean.getPrice();
+        //类型不能为空
+        if(bean.getType() == null){
+            return Result.error("类型不能为空");
+        }
         //充值
         if(bean.getType() == 0){
             //充值金额需大于0
@@ -1341,9 +1345,10 @@ public class OrderCreateVipServiceImpl implements OrderCreateVipService {
                             .eq(MsgTer::getState,1)
                             .one();
 
-                    one1.setCard(bean.getCard());
-                    one1.setBank(bean.getBank());
-                    msgTerService.updateById(one1);
+
+//                    one1.setCard(bean.getCard());
+//                    one1.setBank(bean.getBank());
+//                    msgTerService.updateById(one1);
 
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/TerServiceImpl.java

@@ -91,7 +91,7 @@ public class TerServiceImpl implements TerService {
                     .eq(MsgDateConfig::getTenId, technician.getId())
                     .list();
             if(msgDateConfigs.size()>0){
-                return Result.error("已初始化排期", msgDateConfigs);
+                return Result.OK("已初始化排期", msgDateConfigs);
             }else{
                 //先循环日期,日期内再循环时间，获得日期和时间，写入技师时间安排里
                 for (int i = 0; i < msgDates.size(); i++) {
@@ -203,7 +203,7 @@ public class TerServiceImpl implements TerService {
                     .eq(MsgShopConfig::getTenId, technician.getId())
                     .list();
             if(msgShopConfigs.size()>0){
-                return Result.error("已初始化排期");
+                return Result.OK("已初始化排期");
             }else{
                 //循环写入项目信息到技师项目配置里
                 for (int i = 0; i < msgShops.size(); i++) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java

@@ -204,6 +204,13 @@ public class UserVipApiServiceImpl implements UserVipApiService {
                     .like(MsgTechnician::getTitle, pageBean.getTitle())
                     .page(page);
         }
+        if(!StringUtils.isBlank(pageBean.getCounty())){
+            pageList = msgTechnicianService
+                    .lambdaQuery()
+                    .eq(MsgTechnician::getCounty, pageBean.getCounty())
+                    .page(page);
+        }
+
         return Result.ok(pageList);
     }
 
@@ -840,10 +847,10 @@ public class UserVipApiServiceImpl implements UserVipApiService {
         if(bean.getTenantId() == null){
             return Result.error("技师标识不能为空");
         }
-        //项目标识不能为空
-        if(bean.getProjectId() == null){
-            return Result.error("项目标识不能为空");
-        }
+//        //项目标识不能为空
+//        if(bean.getProjectId() == null){
+//            return Result.error("项目标识不能为空");
+//        }
         //类型不能为空
         if(bean.getType() == null){
             return Result.error("类型不能为空");
@@ -856,7 +863,7 @@ public class UserVipApiServiceImpl implements UserVipApiService {
                 .lambdaQuery()
                 .eq(MsgEvaluate::getUserId, hanHaiMember.getId())
                 .eq(MsgEvaluate::getType, 0)
-                .eq(MsgEvaluate::getShopId, bean.getProjectId())
+//                .eq(MsgEvaluate::getShopId, bean.getProjectId())
                 .eq(MsgEvaluate::getTerId, bean.getTenantId())
                 .eq(MsgEvaluate::getFraction, bean.getFraction())
                 .orderByDesc(MsgEvaluate::getCreateTime)
@@ -866,7 +873,7 @@ public class UserVipApiServiceImpl implements UserVipApiService {
                     .lambdaQuery()
                     .eq(MsgEvaluate::getUserId, hanHaiMember.getId())
                     .eq(MsgEvaluate::getType, bean.getType())
-                    .eq(MsgEvaluate::getShopId, bean.getProjectId())
+//                    .eq(MsgEvaluate::getShopId, bean.getProjectId())
                     .eq(MsgEvaluate::getFraction, bean.getFraction())
                     .eq(MsgEvaluate::getTerId, bean.getTenantId())
                     .orderByDesc(MsgEvaluate::getCreateTime)