czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

收银呗改为快银收银，部分调整

Browse Source
This commit is contained in:
liuyingfang
2023-05-08 11:00:47 +08:00
parent f8a583063f
commit 4a5bc0dd25
19 changed files with 87 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBaseInfoController.java
View File

@@ -253,6 +253,40 @@ public class MerchantBaseInfoController {
return ResultGenerator.genFailResult("系统繁忙，请稍后再试");
}
}
@GetMapping("/queryMerchantActivityApplet")
@ApiOperation(value = "查询商家活动", notes = "查询商家活动", httpMethod = "POST")
public Result<?> merchantActivityApplet(@RequestParam Integer id) {
Map<String, Object> result = new HashMap<String, Object>(16);
try {
if(id == null){
return ResultGenerator.genFailResult("id为空");
}
MerchantBaseInfo merchantBaseInfo;
MerchantBaseInfo queryMerchantBaseInfo = new MerchantBaseInfo();
queryMerchantBaseInfo.setId(id.longValue());
merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(queryMerchantBaseInfo);
ActivityActivate activityActivate = new ActivityActivate();
activityActivate.setMerchantCode(merchantBaseInfo.getMerchantCode());
List<ActivityActivate> queryActivityActivateList = activityActivateService
.queryActivityActivateList(activityActivate);
result.put("activityActivateList", queryActivityActivateList);
ActivityRecharge activityRecharge = new ActivityRecharge();
activityRecharge.setMerchantCode(merchantBaseInfo.getMerchantCode());
List<ActivityRecharge> queryActivityRechargeList = activityRechargeService
.queryActivityRechargeList(activityRecharge);
result.put("activityRechargeList", queryActivityRechargeList);
ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
activityConsumReturn.setMerchantCode(merchantBaseInfo.getMerchantCode());
List<ActivityConsumReturn> queryActivityConsumReturnList = activityConsumReturnService
.queryActivityConsumReturnList(activityConsumReturn);
result.put("activityConsumReturnList", queryActivityConsumReturnList);
return ResultGenerator.genSuccessResult(result);
} catch (Exception e) {
e.printStackTrace();
return ResultGenerator.genFailResult("系统繁忙，请稍后再试");
}
}
@PostMapping("/manageMerchantManageList")
@ApiOperation(value = "多商户管理列表", notes = "多商户管理列表", httpMethod = "POST")

3
pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberController.java
View File

@@ -113,9 +113,6 @@ public class MerchantMenberController {
@ApiImplicitParams({
@ApiImplicitParam(name = "MerchantMenber", value = "查询对象的实例信息", paramType = "body", dataType = "MerchantMenber"),})
public Result<PageInfo<MerchantMenber>> listInfo(@RequestBody MerchantMenber merchantMenber) {
UserApp tokenUa = userAppService.queryUserAppByToken();
merchantMenber.setMerchantCode(tokenUa.getMerchantCode());
if (merchantMenber.getId() == null) {
return ResultGenerator.genFailResult("无商家编码！");
}

2
pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
View File

@@ -59,6 +59,8 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
limitUri.add("/api/merchantOrder/pos/tradeQuery");
limitUri.add("/api/merchantOrder/returnOrder");
limitUri.add("/api/memberOrder");
limitUri.add("/api/merchantMenber/info");
limitUri.add("/api/merchantBaseInfo/queryMerchantActivityApplet");
boolean passFlag = limitUri.stream().anyMatch(s -> s.equals(requestUri) || requestUri.startsWith(s));
if (passFlag) {
return true;

13
pluss-api-page/src/main/resources/application-dev.yml
View File

@@ -1,9 +1,14 @@
spring:
# datasource:
# url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: root
# password: CZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
datasource:
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
parameter:
### 这个根据自己的情况配置
domain: https://ky.sxczgkj.cn