Merge #31 into master from cc_2021104_twelve_points

十二分 * cc_2021104_twelve_points: (34 commits squashed) - fix:启用禁用规则合并 - Merge branch 'refs/heads/master' into cc_2021104_twelve_points - fix:惩处规则列表新增描述字段 - fix:新增用户管辖门店列表接口 - fix:门店列表接口新增门店积分字段 - fix:查询问题修复；新增草稿状态 - fix:申请单审批补充审批人字段 - fix:修改门店积分限制0-12 - fix:积分流水接口修复；申请单查询接口添加日期筛选 - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选 - fix:惩处单复议申请查询异常修复 - fix:小程序惩处单详情接口字段补充 - fix:查询字段补充 - fix - fix:转义 - fix - fix:新增撤销复议申请单接口 - fix:补充字段 - fix:补充字段 - fix:新增门店分数接口 - fix:申请单新增筛选条件 - fix:门店积分接口返回参数修改 - fix:小程序规则分页查询接口改为Post - fix:问题修复 - fix:十二分导入 - fix:导入状态部分失败改为失败 - fix:字段补充 - fix:异步下Excel导入图片临时文件被清理的问题 - fix:扣分申请导入图片路径修改并使用CDN - fix:导入图片上传oss文件类型修改为图片 - fix:批量审批 - fix:批量审批新增备注字段 - fix:字段补充 - Merge branch 'master' into cc_2021104_twelve_points # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java #	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java #	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com> Reviewed-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/31
2026-01-23 06:48:53 +00:00
parent 1b1684f373
commit 41ae24478d
39 changed files with 998 additions and 46 deletions
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java
@@ -2,14 +2,17 @@ package com.cool.store.controller.webb;

 import com.cool.store.common.PageBasicInfo;
 import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.request.store.StoreListRequest;
 import com.cool.store.request.UserStoreRequest;
 import com.cool.store.response.MiniShopsResponse;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.StoreService;
+import com.cool.store.vo.store.StoreListVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 /**
@@ -32,4 +35,11 @@ public class PCStoreController {
    public ResponseResult<PageInfo<MiniShopsResponse>> getCurrentUserStoreList(@RequestBody UserStoreRequest request) {
        return ResponseResult.success(storeService.getStoreListByMobile(CurrentUserHolder.getUser().getMobile(), request.getPageNum(), request.getPageSize(), request.getKeyword(), null));
    }
+
+    @ApiOperation("当前用户管辖下的门店列表")
+    @PostMapping("/storeList")
+    public ResponseResult<PageInfo<StoreListVO>> getStoreList(@RequestBody @Validated StoreListRequest request) {
+        return ResponseResult.success(storeService.getAuthStoreList(request));
+    }
+
 }
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TpApplyController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TpApplyController.java
@@ -3,10 +3,7 @@ package com.cool.store.controller.webb;
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.enums.tp.TpFormTypeEnum;
-import com.cool.store.request.tp.TpAppealApplyRequest;
-import com.cool.store.request.tp.TpApplyAuditRequest;
-import com.cool.store.request.tp.TpApplyQueryRequest;
-import com.cool.store.request.tp.TpApplyRequest;
+import com.cool.store.request.tp.*;
 import com.cool.store.response.AuditInfoResponse;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.tp.TpApplyService;
@@ -18,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;

 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -86,7 +84,7 @@ public class TpApplyController {

    @ApiOperation("惩处申请单分页查询")
    @PostMapping("/penaltyPage")
-    public ResponseResult<PageInfo<TpPenaltyApplyListVO> > penaltyPage(@RequestBody TpApplyQueryRequest request) {
+    public ResponseResult<PageInfo<TpPenaltyApplyListVO>> penaltyPage(@RequestBody TpApplyQueryRequest request) {
        request.setIsPenalty(true);
        return ResponseResult.success(tpApplyService.penaltyPage(request));
    }
@@ -146,4 +144,16 @@ public class TpApplyController {
    public ResponseResult<Boolean> completePayment(@NotNull(message = "申请单id不能为空") Long applyId) {
        return ResponseResult.success(tpApplyService.completePayment(applyId));
    }
+
+    @ApiOperation("惩处申请单Excel导入")
+    @PostMapping("/penaltyImport")
+    public ResponseResult<Boolean> penaltyImport(MultipartFile file) {
+        return ResponseResult.success(tpApplyService.penaltyImport(file));
+    }
+
+    @ApiOperation("批量审批")
+    @PostMapping("/batchAudit")
+    public ResponseResult<List<TpBatchAuditVO>> batchAudit(@RequestBody @Validated TpBatchAuditRequest request) {
+        return ResponseResult.success(tpApplyService.batchAudit(request));
+    }
 }
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TpRuleController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TpRuleController.java
@@ -4,6 +4,7 @@ import com.cool.store.common.InsertGroup;
 import com.cool.store.common.UpdateGroup;
 import com.cool.store.request.tp.TpPenaltyRuleUpdateRequest;
 import com.cool.store.request.tp.TpRewardRuleUpdateRequest;
+import com.cool.store.request.tp.TpRuleEnableRequest;
 import com.cool.store.request.tp.TpRuleQueryRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.tp.TpRuleService;
@@ -96,13 +97,7 @@ public class TpRuleController {

    @ApiOperation("启用规则")
    @PostMapping("/enable")
-    public ResponseResult<Boolean> enableRuleByIds(@RequestBody List<Long> ruleIds) {
-        return ResponseResult.success(tpRuleService.enableRuleByIds(ruleIds, 1));
-    }
-
-    @ApiOperation("禁用规则")
-    @PostMapping("/disable")
-    public ResponseResult<Boolean> disableRuleByIds(@RequestBody List<Long> ruleIds) {
-        return ResponseResult.success(tpRuleService.enableRuleByIds(ruleIds, 0));
+    public ResponseResult<Boolean> enableRuleByIds(@RequestBody @Validated TpRuleEnableRequest request) {
+        return ResponseResult.success(tpRuleService.enableRuleByIds(request.getRuleIds(), request.getStatus()));
    }
 }
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTpApplyController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTpApplyController.java
@@ -2,14 +2,12 @@ package com.cool.store.controller.webc;

 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.enums.tp.TpFormTypeEnum;
-import com.cool.store.request.tp.TpAppealApplyRequest;
-import com.cool.store.request.tp.TpApplyQueryRequest;
-import com.cool.store.request.tp.TpApplyRequest;
-import com.cool.store.request.tp.TpRuleQueryRequest;
+import com.cool.store.request.tp.*;
 import com.cool.store.response.AuditInfoResponse;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.tp.TpApplyService;
 import com.cool.store.vo.PartnerUserInfoVO;
+import com.cool.store.vo.tp.TpStoreScoreVO;
 import com.cool.store.vo.tp.mini.MiniTpApplyListVO;
 import com.cool.store.vo.tp.mini.MiniTpPenaltyApplyVO;
 import com.cool.store.vo.tp.mini.MiniTpRewardApplyVO;
@@ -17,12 +15,15 @@ import com.cool.store.vo.tp.mini.MiniTpRuleListVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.List;

 /**
@@ -37,6 +38,7 @@ import java.util.List;
@RestController
@RequestMapping("/mini/tp/apply")
@RequiredArgsConstructor
+@Validated
 public class MiniTpApplyController {
    private final TpApplyService tpApplyService;

@@ -97,19 +99,28 @@ public class MiniTpApplyController {
    }

    @ApiOperation("规则分页查询")
-    @GetMapping("/rulePage")
-    @ApiImplicitParam(name = "type", value = "规则类型，0惩处 1加分", required = true, dataType = "Integer", paramType = "query")
-    public ResponseResult<PageInfo<MiniTpRuleListVO>> rewardRulePage(@NotNull(message = "规则类型不能为空") Integer type) {
-        TpRuleQueryRequest request = new TpRuleQueryRequest();
-        request.setType(type);
+    @PostMapping("/rulePage")
+    public ResponseResult<PageInfo<MiniTpRuleListVO>> rewardRulePage(@RequestBody TpRuleQueryRequest request) {
        request.setStatus(1);
        return ResponseResult.success(tpApplyService.getMiniRulePage(request));
    }

    @ApiOperation("认罚缴款")
    @PostMapping("/acceptPenalty")
-    @ApiImplicitParam(name = "applyId", value = "惩处申请单id", required = true, dataType = "Long", paramType = "query")
-    public ResponseResult<Boolean> acceptPenalty(@NotNull(message = "惩处申请单id不能为空") Long applyId) {
-        return ResponseResult.success(tpApplyService.acceptPenalty(applyId));
+    public ResponseResult<Boolean> acceptPenalty(@RequestBody @Validated TpApplyIdRequest request) {
+        return ResponseResult.success(tpApplyService.acceptPenalty(request.getApplyId()));
+    }
+
+    @ApiOperation("撤销复议申请")
+    @PostMapping("/withdrawAppeal")
+    public ResponseResult<Boolean> withdrawAppeal(@RequestBody @Validated TpApplyIdRequest request) {
+        return ResponseResult.success(tpApplyService.withdrawAppeal(request.getApplyId()));
+    }
+
+    @ApiOperation("门店积分")
+    @GetMapping("/storeScore")
+    @ApiImplicitParam(name = "storeId", value = "门店id", required = true, dataType = "String", paramType = "query")
+    public ResponseResult<TpStoreScoreVO> storeScore(@NotBlank(message = "门店id不能为空") String storeId) {
+        return ResponseResult.success(tpApplyService.getStoreScore(storeId));
    }
 }
--- a/coolstore-partner-web/src/main/resources/application-local.properties
+++ b/coolstore-partner-web/src/main/resources/application-local.properties
@@ -46,14 +46,14 @@ rocketmq.orderTopic=zx_order_message
 oss.excelFile.dir=lineExcel/
 oss.accessKeyId=LTAI5tGBwmXwZkMuHK4MudMJ
 oss.accessKeySecret=bnZoUMRQ9834STgz5E291YrqlBu6yn
-oss.bucket=store-ossfile
+oss.bucket=store-ossfile-zx
 oss.file.dir=eid/${mybatis.configuration.variables.enterpriseId}/
 oss.endpoint=oss-cn-hangzhou.aliyuncs.com
 oss.host=https://oss-cool.coolstore.cn/


 #cdn地址
-cdn.url=https://oss-cool.coolstore.cn
+cdn.url=https://ossfilezx.coolstore.cn/

 #TRTC
 trtc.sdkAppId=1600026212
@@ -150,4 +150,18 @@ wallet.url=https://api.dev.wenmatech.com:443
 wallet.api.yzt.key=360155690205317
 cool.api.rsa.private.key=MIIEpQIBAAKCAQEA0erPAWesjkp9J4htmfCyqKS9npmT9dW3KqWTfb4c7x/QBUtKuokWOO0XikHd4bGUa9kl+twSv/5A3kYz1B9eg6wRuDJoads+G5U7rVQjzdoUtLaf3lNXkuSehl4uHUPQfNa6vcmvzraXPxJjEpYzj9WZh7uJqq2oSgw42H1qdbFCXSaE5BwsOb+2vZXjzh4RO10Sy3Qb1UqGsoZoxVzrtDeEctCjrecFyQr96L2UtYa4NTxSTfu4rgObrwIOMvqqnLsXEzK/rd6kIHYjkZYQCOa48AedWp2YKQ7Ldclj+VMLnXvl42J9exVkbs++8k3P5sI9fdZX4Ey2RBjnSoAo/QIDAQABAoIBACbBGi8I+CE77M+13wAu4RkD8xL7CQc3ic2ojGqIRPi7r5CuphD6mpzvXqtyfhd7DKr9h8bAxwBlnQ28ObjVgsI96/aM7dxvMs/uVPpqwIJyWuTDG5A05EPVC9REQnC6Mp09mnPL7rZz3Mfy6dIGY2YQWfwmWiPl1B45k+wZ+WPZPI0JVnvRzM881kf4aAhEAt08i9VoihylwVAjWIPmLuhf6ZcqI5q8iUsjfO22wZJsudVTCA/dsJdNxv+1RDKeYnSLJL79cZQcodqEhFqTy6vnn2dMsaHH7dpphU27barxUjeL482SR7kFfMqEXn5sltRn/3ep+3sf4Ph2vMtoZeECgYEA6gXzEtT9ZOeAMp4BRGmfNZ0TQLprPPVSwudz/uUBE4j/vyhfXkh9p7hqwyoxN+Z8b65yINvx8yP6hge6ek/MyAwBCZyfIRxZAPZu1eEGoYKl391ubFt2EIVqrN2DtAvzHMr5B/E2VHBq6AJm/rERFX5oKsg6zHS9tPLhgGnWVd0CgYEA5aFWOrtiqZJlp1MHQ4OeWBJatBSynkORdxCW7ic0CKbkYus0NSz1SsvskpbnfEXNB53x98qJxRhSopg/DC4m7XqxjSf9lY3HH4Y/9907olj33yGAnLWC88GivVndt577u/XhYRCk33vOQ3GoibEdjnpMOkWmOfwYG/FsRWWQvaECgYEA1N2siEisZIgel+wZAv2AD+hchtgKi1wqd5bIb+Yl4HsRBfPXK4+MnG6mzfcm5c4FCiEHNtRZc+waCKgm+vJzNtOUbgXEyP1cCAAgOPOCcI7CCqsDshRPhB+XNL4Y+kCUVnBZrNu/q3bGB1uIC8tL2t0sKx4OPcNCe8EhVQjwKRECgYEA4uothdhKRPtwDIsVsHfN74Yjr7SMVay7gIcaPrjqyGnzYnS+oJWOx50AaFNK6Rko5JAF3jF9NxE0B4yfMPAic6Y88hpEkpcJ4HMPn2Y1WdbFCu/WYgVUJICCys6VNLCcXj85umtyIY38Y9VbEMW/SV49GZBeFQqy4FoP/fvBrkECgYEAnfjTDYwgdmJdsUqyNzAocwcJXG2rVtYc7Txrl0TltcwuJmgoSywdzyOP2R9+NZsfoxWDzG0/yr15ApMvUcnnTwHN/8bGQ9SLatFLKqS4EtdwDKKS1JvNbs7V1myQGpt7jbShZOI0e6Fs4xP8ujxsLeGgiq9mZrS9UdRj5XKDoVM=
 cool.api.rsa.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0erPAWesjkp9J4htmfCyqKS9npmT9dW3KqWTfb4c7x/QBUtKuokWOO0XikHd4bGUa9kl+twSv/5A3kYz1B9eg6wRuDJoads+G5U7rVQjzdoUtLaf3lNXkuSehl4uHUPQfNa6vcmvzraXPxJjEpYzj9WZh7uJqq2oSgw42H1qdbFCXSaE5BwsOb+2vZXjzh4RO10Sy3Qb1UqGsoZoxVzrtDeEctCjrecFyQr96L2UtYa4NTxSTfu4rgObrwIOMvqqnLsXEzK/rd6kIHYjkZYQCOa48AedWp2YKQ7Ldclj+VMLnXvl42J9exVkbs++8k3P5sI9fdZX4Ey2RBjnSoAo/QIDAQAB
-wallet.api.rsa.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvU5WUX5MaZhS4MRfZ5OeqmSxTgjNi64SEwTiDYS++DRHRFTEguk1g5AbiW3l9eEdATeVk0WX+T6ZIIa2do3bQOKhlMtRwWMWQIucjGa7ySOCuicvnCD2HAQ2EThfqQdSpAW5UpcyodrhcyUkuevBA4fQQ06k9lB4FjqWtao2+aYFIPFPu8Wu28KI/9QIMLI02Q1YY3duJ67QW4EM4I2oS0t3sWJeZtIJPRHFWW1EaLJz2FdbJJq+z6D2p++9pmkHsvdnktUUO+nPL3PCLtxGYxEwr/AqTYR/1yXfkVWe3nHXc+qvRt967X1hDHC+gEPJItr7kUk3pQTGBv9kNu75DwIDAQAB
+wallet.api.rsa.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvU5WUX5MaZhS4MRfZ5OeqmSxTgjNi64SEwTiDYS++DRHRFTEguk1g5AbiW3l9eEdATeVk0WX+T6ZIIa2do3bQOKhlMtRwWMWQIucjGa7ySOCuicvnCD2HAQ2EThfqQdSpAW5UpcyodrhcyUkuevBA4fQQ06k9lB4FjqWtao2+aYFIPFPu8Wu28KI/9QIMLI02Q1YY3duJ67QW4EM4I2oS0t3sWJeZtIJPRHFWW1EaLJz2FdbJJq+z6D2p++9pmkHsvdnktUUO+nPL3PCLtxGYxEwr/AqTYR/1yXfkVWe3nHXc+qvRt967X1hDHC+gEPJItr7kUk3pQTGBv9kNu75DwIDAQAB
+
+huoMa.token.url = https://www.huoMayunping.com/api/SAASLogin/merchant
+huoMa.id.url = https://www.huomayunping.com/api/reportCenter/executeSql
+huoMa.store.device.detail.url = https://www.huomayunping.com/api/terminal/search
+huoMa.get.point.terminal.url = https://www.huoMayunping.com/api/terminal/getPointTerminalInfos
+huoMa.get.tag.url = https://www.huomayunping.com/api/tag/search
+huoMa.get.program.url = https://www.huomayunping.com/api/program/search
+huoMa.get.publish.url = https://www.huomayunping.com/api/channelPublish/target/v2/quick-publish
+huoMa.direct.stores.account = 18375320931
+huoMa.direct.stores.password = Huoma@123456.
+huoMa.franchise.stores.account = 13345565081
+huoMa.franchise.stores.password = Huoma@123456.
+huoMa.restaurant.stores.account = 15167817007
+huoMa.restaurant.stores.password = Huoma@123456.