diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBaseInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBaseInfoController.java index 7747745..e7afab4 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBaseInfoController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBaseInfoController.java @@ -253,6 +253,40 @@ public class MerchantBaseInfoController { return ResultGenerator.genFailResult("系统繁忙，请稍后再试"); } } + @GetMapping("/queryMerchantActivityApplet") + @ApiOperation(value = "查询商家活动", notes = "查询商家活动", httpMethod = "POST") + public Result merchantActivityApplet(@RequestParam Integer id) { + Map result = new HashMap(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 queryActivityActivateList = activityActivateService + .queryActivityActivateList(activityActivate); + result.put("activityActivateList", queryActivityActivateList); + ActivityRecharge activityRecharge = new ActivityRecharge(); + activityRecharge.setMerchantCode(merchantBaseInfo.getMerchantCode()); + List queryActivityRechargeList = activityRechargeService + .queryActivityRechargeList(activityRecharge); + result.put("activityRechargeList", queryActivityRechargeList); + ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn(); + activityConsumReturn.setMerchantCode(merchantBaseInfo.getMerchantCode()); + List 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") diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberController.java index b547eba..ff5bf19 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberController.java @@ -113,9 +113,6 @@ public class MerchantMenberController { @ApiImplicitParams({ @ApiImplicitParam(name = "MerchantMenber", value = "查询对象的实例信息", paramType = "body", dataType = "MerchantMenber"),}) public Result> listInfo(@RequestBody MerchantMenber merchantMenber) { - UserApp tokenUa = userAppService.queryUserAppByToken(); - merchantMenber.setMerchantCode(tokenUa.getMerchantCode()); - if (merchantMenber.getId() == null) { return ResultGenerator.genFailResult("无商家编码！"); } diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java index 9ddb816..4f8ade6 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java @@ -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; diff --git a/pluss-api-page/src/main/resources/application-dev.yml b/pluss-api-page/src/main/resources/application-dev.yml index ed42989..f02b856 100644 --- a/pluss-api-page/src/main/resources/application-dev.yml +++ b/pluss-api-page/src/main/resources/application-dev.yml @@ -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 diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java index e9b0b08..7234c2f 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java @@ -132,11 +132,11 @@ public class YtCreateOrder implements Serializable { public YtCreateOrder() { - this.senderName = "收银呗客服部"; - this.senderProvinceName = "湖北省"; - this.senderCityName = "武汉市"; - this.senderCountyName = "洪山区"; - this.senderAddress = "九台别墅42栋"; - this.senderMobile = "18062761507"; + this.senderName = "快银收银客服部"; + this.senderProvinceName = "陕西省"; + this.senderCityName = "西安市"; + this.senderCountyName = "未央区"; + this.senderAddress = "荣民中央国际"; + this.senderMobile = "19191701028"; } } diff --git a/pluss-manage-page/src/main/resources/application-dev.yml b/pluss-manage-page/src/main/resources/application-dev.yml index 47a606e..190fdc5 100644 --- a/pluss-manage-page/src/main/resources/application-dev.yml +++ b/pluss-manage-page/src/main/resources/application-dev.yml @@ -1,9 +1,15 @@ spring: +# datasource: +# druid: +# url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true +# username: root +# password: CZGmysqlroot@123 +# driver-class-name: com.mysql.jdbc.Driver datasource: druid: - url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true + url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 username: root - password: CZGmysqlroot@123 + password: prodCZGmysqlroot@123 driver-class-name: com.mysql.jdbc.Driver logging: config: classpath:log4j2-dev.xml diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceMerchantBuyDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceMerchantBuyDTO.java index 18d551c..5ebe45e 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceMerchantBuyDTO.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceMerchantBuyDTO.java @@ -64,8 +64,8 @@ public class DeviceMerchantBuyDTO { public Map convert(String orderNo) { Map result = new HashMap(16); - result.put("body", "收银呗商品订单支付"); - result.put("subject", "收银呗商品订单支付"); + result.put("body", "快银收银商品订单支付"); + result.put("subject", "快银收银商品订单支付"); result.put("outTradeNo", orderNo); result.put("totalAmount", orderAmount + ""); return result; diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceOperateInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceOperateInfoVO.java index d28f3b8..e01a793 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceOperateInfoVO.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceOperateInfoVO.java @@ -32,7 +32,7 @@ public class DeviceOperateInfoVO extends DeviceOperateInfo { public String getDesc() { String type = this.getType(); if(DeviceOperateType.IN.getCode().equals(type)){ - this.desc = "收银呗设备入库"; + this.desc = "快银收银设备入库"; } if(DeviceOperateType.TRANSFER.getCode().equals(type)){ this.desc = this.getRemark(); diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferVO.java index 2c3f347..00f277d 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferVO.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferVO.java @@ -50,7 +50,7 @@ public class DeviceTransferVO extends DeviceTransfer { public String getUserName() { if(StringUtil.isEmpty(this.userName)){ - this.userName = "收银呗"; + this.userName = "快银收银"; } return userName; } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java index b8fd863..4d552d3 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java @@ -92,7 +92,7 @@ public class CashServiceImpl extends ServiceImpl implements Ca RiskBlacklist entity = rbService.getOne(new QueryWrapper<>(condition)); if (entity != null) { - throw new MsgException("该账户存在重大违规行为，暂不支持提现，请联系收银呗客服申诉"); + throw new MsgException("该账户存在重大违规行为，暂不支持提现，请联系快银收银客服申诉"); } } @@ -516,7 +516,7 @@ public class CashServiceImpl extends ServiceImpl implements Ca alipayService.remit(accountNo, accountName, cash.getVirRealCashAmt().toString()); // 发送分润打款通知 - generalPushUtil.sendAllPlatByAlias(Collections.singletonList(cash.getUserId() + ""), "收银呗分润到账通知", "您的分润已结算至支付宝，快去查看哦！", "1"); + generalPushUtil.sendAllPlatByAlias(Collections.singletonList(cash.getUserId() + ""), "快银收银分润到账通知", "您的分润已结算至支付宝，快去查看哦！", "1"); } @Override diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java index ba667dc..a3be6ab 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java @@ -119,7 +119,7 @@ public class MercAuditListenerImpl implements MercAuditListener { public void onFail(String userId, MerchantChannelStatus mcs, String msg) { MerchantBaseInfo mbi = mbiMapper.queryByMerchantCode(mcs.getMerchantCode()); - String title2 = "收银呗审核通知"; + String title2 = "快银收银审核通知"; String msg2; @@ -141,7 +141,7 @@ public class MercAuditListenerImpl implements MercAuditListener { public void onSuccess(String userId, MerchantChannelStatus mcs) { MerchantBaseInfo mbi = mbiMapper.queryByMerchantCode(mcs.getMerchantCode() + ""); - String title = "收银呗审核通知"; + String title = "快银收银审核通知"; String msg; if (Objects.equals(mcs.getChannel(), 4)) { msg = "商户D0进件通过，完成支付宝及微信认证后即可支持相应渠道收款"; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java index 47b515b..78183d5 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java @@ -833,7 +833,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer UserApp userApp = userAppMapper.selectOne(qWrapper2); String pushMsg = "D0通道" + flagName + typeName + "报备失败，请联系客服进行处理"; - sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", pushMsg, mcs.getApplicationId()); + sxfMerAuditHandler.sendNotice(userApp, "快银收银审核通知", pushMsg, mcs.getApplicationId()); } if (Objects.equals("00", status)) { diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/PushServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/PushServiceImpl.java index 3002718..2655d73 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/PushServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/PushServiceImpl.java @@ -46,13 +46,13 @@ public class PushServiceImpl extends ServiceImpl impleme switch (type) { case MAKE_ORDER: - generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "收银呗线上店订单来了请及时处理", "3"); + generalPushUtil.sendAllPlatByAlias(alias, "快银收银", "快银收银线上店订单来了请及时处理", "3"); break; case URGE_ORDER: - generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "您有一笔催单请及时处理", "3"); + generalPushUtil.sendAllPlatByAlias(alias, "快银收银", "您有一笔催单请及时处理", "3"); break; case REQUEST_SERVICE: - generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "您有一个新的呼叫服务请及时处理", "3"); + generalPushUtil.sendAllPlatByAlias(alias, "快银收银", "您有一个新的呼叫服务请及时处理", "3"); break; case REFUND_ORDER: generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "您有一笔未接单的线上店订单，客户已申请退款。", "2"); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptInfoService.java index fa264ff..69d0626 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptInfoService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptInfoService.java @@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletResponse; /** *

- * 收银呗缴费通收款单 服务类 + * 快银收银缴费通收款单 服务类 *

* * @author crystal diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java index ab3c0e3..25e006a 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java @@ -227,7 +227,7 @@ public class MerchantMenberServiceImpl extends ServiceImpl @@ -405,6 +408,8 @@ public class WechantController { merchantMenberService.updateMerchantMenber(merchantMenber); try { MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantMenber.getMerchantCode()); + MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo(); + merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(queryMerchantBaseInfo); JSONObject miniprogram = new JSONObject(); miniprogram.put("appid",ParametersUtil.APPLETS_APPID); miniprogram.put("pagepath","yb_o2ov2/vip/my-vip?syb_m_id="+store.getId()+"&phone="+merchantMenber.getPhone());