积分、商品搜索bug修复

admin/src/components/Category/edit.vue

@@ -6,7 +6,7 @@
         prop="name"
         :rules="[{ required:true,message:'请输入分类名称',trigger:['blur','change'] }]"
       >
-        <el-input v-model="editPram.name"  maxlength="20" placeholder="分类名称" />
+        <el-input v-model="editPram.name"  :maxlength="biztype.value === 1 ? 5 : 20" placeholder="分类名称" />
       </el-form-item>
       <el-form-item label="URL">
         <el-input v-model="editPram.url" placeholder="URL" />

admin/src/views/systemSetting/logistics/shippingTemplates/creatTemplates.vue

@@ -169,7 +169,6 @@ const defaultRole = {
     firstPrice: 1,
     renewal: 1,
     renewalPrice: 1,
-    city_id: [],
     city_ids: []
   }],
   undelivery: 0,
@@ -276,7 +275,6 @@ export default {
         firstPrice: 1,
         renewal: 1,
         renewalPrice: 1,
-        city_id: [],
         city_ids: []
       }))
     },
@@ -328,7 +326,6 @@ export default {
       logistics.shippingRegion({ tempId: this.tempId }).then(res => {
         res.forEach((item, index) => {
           item.title = JSON.parse(item.title)
-          item.city_id = item.title
           item.city_ids = item.title
         })
         this.ruleForm.region = res
@@ -339,7 +336,6 @@ export default {
       logistics.shippingFree({ tempId: this.tempId }).then(res => {
         res.forEach((item, index) => {
           item.title = JSON.parse(item.title)
-          item.city_id = item.title
           item.city_ids = item.title
         })
         this.ruleForm.free = res
@@ -387,13 +383,11 @@ export default {
             sort: this.ruleForm.sort,
             type: this.ruleForm.type,
             // 配送区域及运费
-            shippingTemplatesRegionRequestList: [],
+            // shippingTemplatesRegionRequestList: [],
-            // 指定包邮设置
+            // // 指定包邮设置
-            shippingTemplatesFreeRequestList: []
+            // shippingTemplatesFreeRequestList: []
           }
-          console.log(this.ruleForm.region)
           this.ruleForm.region.forEach((el, index) => {
-            console.log(el)
             el.title = el.city_ids.length > 0 ? JSON.stringify(el.city_ids) : JSON.stringify([[0, 0]])
             for (var i = 0; i < el.city_ids.length; i++) {
               el.city_ids[i].shift()
@@ -426,10 +420,10 @@ export default {
               this.$nextTick(() => {
                 this.dialogVisible = false
                 this.$refs[formName].resetFields()
+                this.clear()
               })
               setTimeout(() => {
                 this.$emit('getList')
-                console.log(this.$refs, 'this.$refs[formName]')
               }, 600)
             })
           } else {
@@ -437,8 +431,8 @@ export default {
               this.$message.success('操作成功')
               setTimeout(() => {
                 this.$emit('getList')
-                // this.$refs[formName].resetFields()
+                this.$refs[formName].resetFields()
-                // this.clear()
+                this.clear()
               }, 600)
               this.$nextTick(() => {
                 this.dialogVisible = false
@@ -450,6 +444,10 @@ export default {
           return false
         }
       })
+    },
+    clear() {
+      this.ruleForm.name = ''
+      this.ruleForm.sort = 0
     }
   }
 }

crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductReplyServiceImpl.java

@@ -141,11 +141,9 @@ public class StoreProductReplyServiceImpl extends ServiceImpl<StoreProductReplyD
 
         if(StringUtils.isNotBlank(request.getDateLimit())){
             dateLimitUtilVo dateLimit = DateUtil.getDateLimit(request.getDateLimit());
-            Date ds = DateUtil.strToDate(dateLimit.getStartTime(), Constants.DATE_FORMAT_DATE);
+            Date ds = DateUtil.strToDate(dateLimit.getStartTime(), Constants.DATE_FORMAT);
-            Date de = DateUtil.strToDate(dateLimit.getEndTime(), Constants.DATE_FORMAT_DATE);
+            Date de = DateUtil.strToDate(dateLimit.getEndTime(), Constants.DATE_FORMAT);
-            lambdaQueryWrapper.between(StoreProductReply::getMerchantReplyTime,
+            lambdaQueryWrapper.between(StoreProductReply::getCreateTime, ds, de);
-                    DateUtil.getSecondTimestamp(ds),
-                    DateUtil.getSecondTimestamp(de));
         }
         lambdaQueryWrapper.orderByDesc(StoreProductReply::getId);
         List<StoreProductReply> dataList = dao.selectList(lambdaQueryWrapper);

crmeb/src/main/java/com/zbkj/crmeb/user/controller/UserController.java

@@ -112,7 +112,7 @@ public class UserController {
      * @since 2020-04-10
      */
     @ApiOperation(value="会员详情")
-    @RequestMapping(value = "infobycondition", method = RequestMethod.GET)
+    @RequestMapping(value = "/infobycondition", method = RequestMethod.GET)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId",example = "1", required = true),
             @ApiImplicitParam(name = "type", value="0=消费记录，1=积分明细，2=签到记录，3=持有优惠券，4=余额变动，5=好友关系", example = "0"

crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserBillServiceImpl.java

@@ -76,6 +76,11 @@ public class UserBillServiceImpl extends ServiceImpl<UserBillDao, UserBill> impl
             }
         }
 
+        // 查询类型
+        if(StringUtils.isNotBlank(request.getCategory())){
+            queryWrapper.eq("category", request.getCategory());
+        }
+
         return dao.selectList(queryWrapper);
     }
 

crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserServiceImpl.java

@@ -1097,7 +1097,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
         userBill.setLinkId(request.getLinkId());  //链接id
         userBill.setMark(getTitle(request).replace("{$value}", request.getValue().toString()));
         userBill.setPm(request.getType());
-        userBill.setBalance(balance);
+        userBill.setBalance(balance.add(request.getValue()));
         userBillService.save(userBill);
     }
 
@@ -1141,7 +1141,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
      * @since 2020-04-10
      */
     private BigDecimal getUserBalance(UserOperateFundsRequest request) {
-        //获取用户资金
+        //获取用户信息
         User user = getById(request.getUid());
 
         BigDecimal value = null;
@@ -1204,6 +1204,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
             case 1:
                 FundsMonitorSearchRequest fmsq = new FundsMonitorSearchRequest();
                 fmsq.setUid(userId);
+                fmsq.setCategory(Constants.USER_BILL_CATEGORY_INTEGRAL);
                 return userBillService.getList(fmsq,pageParamRequest);
             case 2:
                 UserSign userSign = new UserSign();

crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserSignServiceImpl.java

@@ -124,6 +124,9 @@ public class UserSignServiceImpl extends ServiceImpl<UserSignDao, UserSign> impl
 
             //更新用户签到天数
             user.setSignNum(user.getSignNum()+1);
+
+            //更新用户积分
+            user.setIntegral(user.getIntegral().add(userOperateFundsRequest.getValue()));
             userService.updateById(user);
 
             return configVo;