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

12
pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java
View File

@@ -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";
}
}

10
pluss-manage-page/src/main/resources/application-dev.yml
View File

@@ -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

4
pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceMerchantBuyDTO.java
View File

@@ -64,8 +64,8 @@ public class DeviceMerchantBuyDTO {
public Map<String, String> convert(String orderNo) {
Map<String, String> result = new HashMap<String, String>(16);
result.put("body", "收银呗商品订单支付");
result.put("subject", "收银呗商品订单支付");
result.put("body", "快银收银商品订单支付");
result.put("subject", "快银收银商品订单支付");
result.put("outTradeNo", orderNo);
result.put("totalAmount", orderAmount + "");
return result;

2
pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceOperateInfoVO.java
View File

@@ -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();

2
pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferVO.java
View File

@@ -50,7 +50,7 @@ public class DeviceTransferVO extends DeviceTransfer {
public String getUserName() {
if(StringUtil.isEmpty(this.userName)){
this.userName = "收银呗";
this.userName = "快银收银";
}
return userName;
}

4
pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java
View File

@@ -92,7 +92,7 @@ public class CashServiceImpl extends ServiceImpl<CashMapper, Cash> 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<CashMapper, Cash> implements Ca
alipayService.remit(accountNo, accountName, cash.getVirRealCashAmt().toString());
// 发送分润打款通知
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(cash.getUserId() + ""), "收银呗分润到账通知", "您的分润已结算至支付宝，快去查看哦！", "1");
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(cash.getUserId() + ""), "快银收银分润到账通知", "您的分润已结算至支付宝，快去查看哦！", "1");
}
@Override

4
pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java
View File

@@ -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进件通过，完成支付宝及微信认证后即可支持相应渠道收款";

2
pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
View File

@@ -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)) {

6
pluss-service-bundle/src/main/java/cn/pluss/platform/impl/PushServiceImpl.java
View File

@@ -46,13 +46,13 @@ public class PushServiceImpl extends ServiceImpl<PushAllMapper, PushAll> 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");

2
pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptInfoService.java
View File

@@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletResponse;
/**
* <p>
* 收银呗缴费通收款单 服务类
* 快银收银缴费通收款单 服务类
* </p>
*
* @author crystal

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java
View File

@@ -227,7 +227,7 @@ public class MerchantMenberServiceImpl extends ServiceImpl<MerchantMenberMapper,
String unionid = jsonObject.getString("unionid");
String avatar = jsonObject.getString("avatar");
if(StringUtil.isEmpty(memberName) || memberName == "undefined"){
memberName = "收银呗会员"+StringUtil.genRandomNum(6);
memberName = "快银收银会员"+StringUtil.genRandomNum(6);
}
if(StringUtil.isEmpty(avatar) || avatar == "undefined"){
avatar = default_avatar;

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java
View File

@@ -123,7 +123,7 @@ public class RyxPayServiceimpl implements RyxPayService {
if(!RyxConfig.PAY_SUCCESS_CODE.equals(respCode)){
result.put("code",ResultCode.FAIL.code());
if(respMsg.contains("商户需补齐相关资料")){
result.put("msg","D1次日到账：商户未在收银呗APP-商户认证-微信认证内完成授权，暂时无法微信收款");
result.put("msg","D1次日到账：商户未在快银收银APP-商户认证-微信认证内完成授权，暂时无法微信收款");
}
return result;
}

2
pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java
View File

@@ -160,7 +160,7 @@ public class SxfPayServiceImpl implements SxfPayService {
if (respData.get("bizMsg").toString().contains("使用微信支付")) {
result.put("msg", "云闪付/京东支付失败：同一支付通道下一张身份证最多注册一个小微商户");
} else if (respData.get("bizMsg").toString().contains("商户需补齐相关资料") || respData.get("bizMsg").toString().contains("微信实名认证")) {
result.put("msg", "D1次日到账：商户未在收银呗APP-商户认证-微信认证内完成授权，暂时无法微信收款");
result.put("msg", "D1次日到账：商户未在快银收银APP-商户认证-微信认证内完成授权，暂时无法微信收款");
} else {
result.put("msg", respData.get("bizMsg"));
}

12
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayOldServiceImpl.java
View File

@@ -92,7 +92,7 @@ public class YsPayOldServiceImpl extends YsPayServiceImpl{
reqData.put("shopdate",DateUtils.toString(DateUtils.currentDate(),"yyyyMMdd"));
reqData.put("total_amount",order.getAmount());
reqData.put("seller_id",jftChannel.getMerchantId());
reqData.put("seller_name",jftChannel.getMercName());
//reqData.put("seller_name",jftChannel.getMercName());
reqData.put("timeout_express",TIMEOUT_EXPRESS);
if(StringUtil.isNotEmpty(order.getSubject())){
reqData.put("subject",order.getSubject());
@@ -152,7 +152,7 @@ public class YsPayOldServiceImpl extends YsPayServiceImpl{
}
JSONObject reqData = setPayCommonParams(order,channel.getMerchantId());
if(StringUtil.isNotEmpty(channel.getMercName())){
reqData.put("seller_name",channel.getMercName());
//reqData.put("seller_name",channel.getMercName());
}
reqData.put("business_code",YsBusinessCodeEnum.getCodeValue(channel.getSettlementType()));
merchant.setChannelLimitPay(reqData,channel.getChannel());
@@ -268,7 +268,7 @@ public class YsPayOldServiceImpl extends YsPayServiceImpl{
reqData.put("business_code",YsBusinessCodeEnum.getCodeValue(merchantOrderDTO.getChannelStatus().getSettlementType()));
}
if(StringUtil.isNotEmpty(merchantOrderDTO.getChannelStatus().getMercName())){
reqData.put("seller_name",merchantOrderDTO.getChannelStatus().getMercName());
// reqData.put("seller_name",merchantOrderDTO.getChannelStatus().getMercName());
}
if(merchantOrderDTO.getMerchantBaseInfo() != null){
merchantOrderDTO.getMerchantBaseInfo().setChannelLimitPay(reqData,Integer.valueOf(order.getAisleSwitch()));
@@ -706,7 +706,7 @@ public class YsPayOldServiceImpl extends YsPayServiceImpl{
}
reqData.put("total_amount",order.getConsumeFee().toString());
reqData.put("seller_id",merchantId);
reqData.put("seller_name",StringUtil.isNotEmpty(order.getAlias()) ? order.getAlias() : order.getMerchantName());
//reqData.put("seller_name",StringUtil.isNotEmpty(order.getAlias()) ? order.getAlias() : order.getMerchantName());
reqData.put("timeout_express",TIMEOUT_EXPRESS);
reqData.put("submer_ip","127.0.0.1");
if(StringUtil.isNotEmpty(order.getExtendParam())){
@@ -763,9 +763,9 @@ public class YsPayOldServiceImpl extends YsPayServiceImpl{
request.put("total_amount",order.getConsumeFee().toString());
request.put("seller_id",channel.getMerchantId());
if(StringUtil.isNotEmpty(channel.getMercName())){
request.put("seller_name",channel.getMercName());
//request.put("seller_name",channel.getMercName());
}else{
request.put("seller_name",StringUtil.isNotEmpty(order.getAlias()) ? order.getAlias() : order.getMerchantName());
//request.put("seller_name",StringUtil.isNotEmpty(order.getAlias()) ? order.getAlias() : order.getMerchantName());
}
request.put("timeout_express",TIMEOUT_EXPRESS);
request.put("business_code",YsBusinessCodeEnum.D1.getCode());

7
pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java
View File

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -15,6 +16,7 @@ import cn.pluss.platform.api.ResultGenerator;
import cn.pluss.platform.constants.Constant;
import cn.pluss.platform.entity.*;
import cn.pluss.platform.exception.MsgException;
import cn.pluss.platform.merchant.MerchantBaseInfoService;
import cn.pluss.platform.merchantStore.MerchantStoreService;
import cn.pluss.platform.pay.ApiPayService;
import cn.pluss.platform.systemConfig.SystemConfigService;
@@ -78,7 +80,8 @@ public class WechantController {
@Setter(onMethod_ = {@Autowired})
private RestTemplate restTemplate;
@Resource
private MerchantBaseInfoService merchantBaseInfoService;
/**
*
* goUpgradePage:(跳转到升级页面). <br/>
@@ -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());