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

把收银呗字全部转化,并且收银点更改

Browse Source
This commit is contained in:
liuyingfang
2024-02-21 11:46:12 +08:00
parent 028a427405
commit e2aa4e954f
42 changed files with 192 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java
View File

@@ -159,8 +159,12 @@ public class MerchantCashPlaceController {
*/ */
@GetMapping("/cutChannel") @GetMapping("/cutChannel")
public Result<Object> cutChannel(@RequestParam String merchantCode, public Result<Object> cutChannel(@RequestParam String merchantCode,
@RequestParam String code){ @RequestParam String code,
cashPlaceStaffService.cutChannel(merchantCode, code); @RequestParam Integer channel){
return ResultGenerator.genSuccessResult(); Boolean aBoolean = cashPlaceStaffService.cutChannel(merchantCode, code, channel);
if (aBoolean){
return ResultGenerator.genSuccessResult();
}
return ResultGenerator.genFailResult("无法切换该通道");
} }
} }

8
pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java
View File

@@ -246,25 +246,25 @@ public class ParameterConfig {
public String LESHUALIU; public String LESHUALIU;
/** /**
* 收银呗微信普通商户APPID * 银收客微信普通商户APPID
*/ */
@Value("${parameter.MERCHANT_APPID}") @Value("${parameter.MERCHANT_APPID}")
public String MERCHANT_APPID; public String MERCHANT_APPID;
/** /**
* 收银呗微信普通商户Appsecret * 银收客微信普通商户Appsecret
*/ */
@Value("${parameter.MERCHANT_APPSECRET}") @Value("${parameter.MERCHANT_APPSECRET}")
public String MERCHANT_APPSECRET; public String MERCHANT_APPSECRET;
/** /**
* 收银呗微信普通商户号 * 银收客微信普通商户号
*/ */
@Value("${parameter.MERCHANT_PID}") @Value("${parameter.MERCHANT_PID}")
public String MERCHANT_PID; public String MERCHANT_PID;
/** /**
* 收银呗微信普通商户key * 银收客微信普通商户key
*/ */
@Value("${parameter.MERCHANT_KEY}") @Value("${parameter.MERCHANT_KEY}")
public String MERCHANT_KEY; public String MERCHANT_KEY;

2
pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxPayNotice.java
View File

@@ -32,7 +32,7 @@ public class JtyYxPayNotice {
* 支付方式 * 支付方式
* 10001 支付宝 * 10001 支付宝
* 10002 微信 * 10002 微信
* 10003 收银呗 * 10003 银收客
*/ */
private String payType; private String payType;

2
pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java
View File

@@ -17,7 +17,7 @@ public class HttpUtils {
String userAgent = request.getHeader("user-agent"); String userAgent = request.getHeader("user-agent");
/** /**
* 仅适用于收银呗app * 仅适用于银收客app
*/ */
return userAgent.contains("iOS"); return userAgent.contains("iOS");
} }

2
pluss-common-bundle/src/main/java/cn/pluss/platform/util/JpushClientUtil.java
View File

@@ -44,7 +44,7 @@ public class JpushClientUtil {
// sendToAllAndroid("测试Android", "测试Android", "测试Android", "https://www.baidu.com"); // sendToAllAndroid("测试Android", "测试Android", "测试Android", "https://www.baidu.com");
// sendToAllIos("测试Ios", "测试信息Ios", "测试信息Ios", "https://www.baidu.com"); // sendToAllIos("测试Ios", "测试信息Ios", "测试信息Ios", "https://www.baidu.com");
// sendToAll("测试全平台", "测试信息全平台", "测试信息全平台", "https://www.baidu.com"); // sendToAll("测试全平台", "测试信息全平台", "测试信息全平台", "https://www.baidu.com");
int a = sendToRegistrationId2(alias, "收银呗到账通知233", "收银呗到账通知", "收银呗到账0.01元", "3","2018-11-23 17:05:25"); int a = sendToRegistrationId2(alias, "银收客到账通知233", "银收客到账通知", "银收客到账0.01元", "3","2018-11-23 17:05:25");
System.out.println(a); System.out.println(a);
System.out.println("发送成功！"); System.out.println("发送成功！");
} }

2
pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushClient.java
View File

@@ -49,7 +49,7 @@ public class MobPushClient {
push.setPushTarget(pushTarget); push.setPushTarget(pushTarget);
Result<PushV3Res> pushV3ResResult = PushV3Client.pushTaskV3(push); Result<PushV3Res> pushV3ResResult = PushV3Client.pushTaskV3(push);
System.out.println(DateUtils.formatDateDefault(new Date(), "yyyy-MM-dd HH:mm:ss")); System.out.println(DateUtils.formatDateDefault(new Date(), "yyyy-MM-dd HH:mm:ss"));
//Result<PushV3Res> result = PushV3Client.pushByRids(null,"收银呗到账","收银呗到账1000.00元","65kyb6mmvuxvaio"); //Result<PushV3Res> result = PushV3Client.pushByRids(null,"银收客到账","银收客到账1000.00元","65kyb6mmvuxvaio");
System.out.println(pushV3ResResult); System.out.println(pushV3ResResult);
return true; return true;
} }

12
pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java
View File

@@ -169,34 +169,34 @@ public class ParametersUtil {
public static String LESHUALIU; public static String LESHUALIU;
/** /**
* 收银呗微信普通商户APPID * 银收客微信普通商户APPID
*/ */
public static String MERCHANT_APPID; public static String MERCHANT_APPID;
/** /**
* 收银呗微信普通商户Appsecret * 银收客微信普通商户Appsecret
*/ */
public static String MERCHANT_APPSECRET; public static String MERCHANT_APPSECRET;
/** /**
* 收银呗微信普通商户号 * 银收客微信普通商户号
*/ */
public static String MERCHANT_PID; public static String MERCHANT_PID;
/** /**
* 收银呗微信普通商户key * 银收客微信普通商户key
*/ */
public static String MERCHANT_KEY; public static String MERCHANT_KEY;
public static String LESHUA_API; public static String LESHUA_API;
/** /**
* @description:收银呗商家公众号APPID * @description:银收客商家公众号APPID
* @date: 2021/9/23 10:27 * @date: 2021/9/23 10:27
*/ */
public static String SJ_APPID; public static String SJ_APPID;
/** /**
* @description:收银呗商家公众号APPSECRET * @description:银收客商家公众号APPSECRET
* @date: 2021/9/23 10:27 * @date: 2021/9/23 10:27
*/ */
public static String SJ_APPSECRET; public static String SJ_APPSECRET;

6
pluss-common-bundle/src/main/resources/config/application-ys.yml
View File

@@ -35,11 +35,11 @@ ys:
## 加密密钥 ## 加密密钥
encryptPwd: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD2J82Gg79Tk8HZ9Zl7EOeLwvUn41c4ktUg6jveIhYLhT encryptPwd: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD2J82Gg79Tk8HZ9Zl7EOeLwvUn41c4ktUg6jveIhYLhT
oldPayV2: oldPayV2:
## 交易发起方编号 收银呗（武汉）科技有限公司 ## 交易发起方编号 银收客（武汉）科技有限公司
srcMerchantNo: srcMerchantNo:
## 收银呗（武汉）科技有限公司 私钥 ## 银收客（武汉）科技有限公司 私钥
payPriKey: payPriKey:
## 收银呗公钥 ## 银收客公钥
sybPubKey: sybPubKey:
# 银盛公钥 # 银盛公钥
payPubKey: payPubKey:

2
pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptInfoMapper.java
View File

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Select;
/** /**
* <p> * <p>
* 收银呗缴费通收款单 Mapper 接口 * 银收客缴费通收款单 Mapper 接口
* </p> * </p>
* *
* @author crystal * @author crystal

11
pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java
View File

@@ -1,10 +1,7 @@
package cn.pluss.platform.mapper; package cn.pluss.platform.mapper;
import cn.pluss.platform.entity.MerchantChannelStatus; import cn.pluss.platform.entity.MerchantChannelStatus;
import cn.pluss.platform.vo.ChannelStatusVO; import cn.pluss.platform.vo.*;
import cn.pluss.platform.vo.MerchantChannelStatusVO;
import cn.pluss.platform.vo.UserNumVO;
import cn.pluss.platform.vo.merchantChannelVO;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -40,6 +37,9 @@ public interface MerchantChannelStatusMapper extends BaseMapper<MerchantChannelS
List<MerchantChannelStatus> selectListWithUserId(@Param(Constants.WRAPPER) Wrapper<MerchantChannelStatus> queryWrapper); List<MerchantChannelStatus> selectListWithUserId(@Param(Constants.WRAPPER) Wrapper<MerchantChannelStatus> queryWrapper);
List<MerchantCashPlaceVO> selectMerchantCode(@Param("merchantCode")String merchantCode, @Param("name")String name,
@Param("pageNum")Integer current, @Param("pageSize")Integer size);
@Select("SELECT * FROM tb_pluss_merchant_channel_status WHERE merchantId = #{merchantId} FOR UPDATE ") @Select("SELECT * FROM tb_pluss_merchant_channel_status WHERE merchantId = #{merchantId} FOR UPDATE ")
MerchantChannelStatus getByMerchantIdLock(@Param("merchantId") String merchantId); MerchantChannelStatus getByMerchantIdLock(@Param("merchantId") String merchantId);
@@ -54,5 +54,6 @@ public interface MerchantChannelStatusMapper extends BaseMapper<MerchantChannelS
UserNumVO getUserNumInfo(@Param("userId") Long userId, @Param("date")String date, @Param("dateType")Integer dateType); UserNumVO getUserNumInfo(@Param("userId") Long userId, @Param("date")String date, @Param("dateType")Integer dateType);
List<merchantChannelVO> pageDate(@Param("pageSize")Integer size, @Param("offset")Integer page); List<merchantChannelVO> pageDate(@Param("pageSize")Integer size, @Param("offset")Integer page);
List<Integer> getChannelByMerchantCode(@Param("merchantCode") String merchantCode,@Param("merchantCodeList") List<String> merchantCodeList); List<Integer> getChannelByMerchantCode(@Param("merchantCode") String merchantCode);
Integer saveChannel(MerchantChannelStatus merchantChannelStatus);
} }

33
pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml
View File

@@ -90,9 +90,34 @@
order by mcs.id desc limit #{pageSize} offset #{offset}; order by mcs.id desc limit #{pageSize} offset #{offset};
</select> </select>
<select id="getChannelByMerchantCode" resultType="java.lang.Integer"> <select id="getChannelByMerchantCode" resultType="java.lang.Integer">
SELECT channel FROM tb_pluss_merchant_channel_status WHERE merchantCode IN SELECT channel FROM tb_pluss_merchant_channel_status WHERE merchantCode=#{merchantCode}
<foreach collection="merchantCodeList" item="item" open="(" close=")" index="index" separator=",">
#{item}
</foreach>
</select> </select>
<select id="selectMerchantCode" resultType="cn.pluss.platform.vo.MerchantCashPlaceVO">
SELECT
a.channel,
a.valid AS tab,
IFNULL(b.alias, "本店铺") AS name,
b.address,
b.createTime,
b.code
FROM
tb_pluss_merchant_channel_status a
LEFT JOIN
tb_merchant_channel_status_exp b ON a.id = b.statusId
WHERE
a.merchantCode = #{merchantCode}
<if test="name != null">
AND b.alias LIKE CONCAT(#{name},'%')
</if>
ORDER BY
a.id
LIMIT
#{pageNum}, #{pageSize}
</select>
<insert id="saveChannel" useGeneratedKeys="true" keyProperty="id" keyColumn="id"
parameterType="cn.pluss.platform.entity.MerchantChannelStatus">
insert into tb_pluss_merchant_channel_status(merchantCode, channel, status, thirdStatus, createTime, updateTime)
VALUES (#{merchantCode}, #{channel}, #{status}, #{thirdStatus}, #{createTime}, #{updateTime})
</insert>
</mapper> </mapper>

2
pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptInfo.java
View File

@@ -21,7 +21,7 @@ import java.util.UUID;
/** /**
* <p> * <p>
* 收银呗缴费通收款单 * 银收客缴费通收款单
* </p> * </p>
* *
* @author crystal * @author crystal

2
pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMemberCode.java
View File

@@ -66,7 +66,7 @@ public class MerchantMemberCode implements Serializable {
private Date startTime; private Date startTime;
/** /**
* 收银呗门店ID * 银收客门店ID
*/ */
@TableField(exist = false) @TableField(exist = false)
private Long storeId; private Long storeId;

2
pluss-model-bundle/src/main/java/cn/pluss/platform/enums/SubAppLetInfo.java
View File

@@ -18,7 +18,7 @@ public enum SubAppLetInfo {
CSY("wx79b08abe2c635a78","f885694fa1cb93656b72db34f3dae211","仓鼠云收银台小程序"), CSY("wx79b08abe2c635a78","f885694fa1cb93656b72db34f3dae211","仓鼠云收银台小程序"),
MIMA("wx4dce83e9d6d42a6c","09d0ec30f8da544e396ad0b716f120f6","密码收银台小程序"), MIMA("wx4dce83e9d6d42a6c","09d0ec30f8da544e396ad0b716f120f6","密码收银台小程序"),
TR("wx6639bea0f0c6d648","d060a877a09b48a8dc42f2eb66e08b25","天润收银小程序"), TR("wx6639bea0f0c6d648","d060a877a09b48a8dc42f2eb66e08b25","天润收银小程序"),
SYB("wxaa8c9e6857a265e1","2ca82f68f5fa680bc6fc924fd22bd52d","收银呗智慧收银小程序"); SYB("wxaa8c9e6857a265e1","2ca82f68f5fa680bc6fc924fd22bd52d","银收客智慧收银小程序");
private String appid; private String appid;

6
pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopValidTask.java
View File

@@ -22,9 +22,9 @@ public class JfShopValidTask extends JfShopCommon {
* 02：订单微信推送 * 02：订单微信推送
* 03：使用一次帮助中心 * 03：使用一次帮助中心
* 04：查看一次产品手册 * 04：查看一次产品手册
* 05：本月使用收银呗收款3天 * 05：本月使用银收客收款3天
* 06：本月使用收银呗收款7天 * 06：本月使用银收客收款7天
* 07：本月使用收银呗收款15天 * 07：本月使用银收客收款15天
*/ */
private String taskType; private String taskType;

5
pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceVO.java
View File

@@ -37,7 +37,10 @@ public class MerchantCashPlaceVO implements Serializable {
* 收银点地址 * 收银点地址
*/ */
private String address; private String address;
/**
* 通道id
*/
private Integer channel;
/** /**
* 备注 * 备注

2
pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/YsOldSrcMerchantNo.java
View File

@@ -16,7 +16,7 @@ public enum YsOldSrcMerchantNo {
RSCY("826521773920170","wxaa8c9e6857a265e1","gh_5a1aa6143567","融商创赢(发起方)"), RSCY("826521773920170","wxaa8c9e6857a265e1","gh_5a1aa6143567","融商创赢(发起方)"),
SYB("826521673920090","wxc2ecf9662691832e","gh_d0571a5c903e","收银呗(发起方)"); SYB("826521673920090","wxc2ecf9662691832e","gh_d0571a5c903e","银收客(发起方)");
private String value; private String value;

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

@@ -80,11 +80,11 @@ public class AlipayServiceImpl implements AlipayService {
bizJson.put("product_code", "TRANS_ACCOUNT_NO_PWD"); bizJson.put("product_code", "TRANS_ACCOUNT_NO_PWD");
bizJson.put("biz_scene", "DIRECT_TRANSFER"); bizJson.put("biz_scene", "DIRECT_TRANSFER");
bizJson.put("payee_info", payeeInfo); bizJson.put("payee_info", payeeInfo);
bizJson.put("order_title", "收银呗分润"); bizJson.put("order_title", "银收客分润");
bizJson.put("remark", "收银呗分润"); bizJson.put("remark", "银收客分润");
JSONObject bizParam = new JSONObject(); JSONObject bizParam = new JSONObject();
bizParam.put("payer_show_name", "收银呗"); bizParam.put("payer_show_name", "银收客");
bizJson.put("business_params", bizParam); bizJson.put("business_params", bizParam);

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

@@ -1314,7 +1314,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
// imageEditUpload(MerchantImage.ImageType.CHANGE_FORM, applyImg, changeSysFlowId); // imageEditUpload(MerchantImage.ImageType.CHANGE_FORM, applyImg, changeSysFlowId);
// //
// log.debug("云商服3.0基本信息变更发起成功"); // log.debug("云商服3.0基本信息变更发起成功");
// String title = "收银呗商户信息变更通知"; // String title = "银收客商户信息变更通知";
// String remark = "D0结算信息变更已发起"; // String remark = "D0结算信息变更已发起";
// //
// entity.setRemark(remark); // entity.setRemark(remark);
@@ -1384,7 +1384,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
// //
// if (count == 0) { // if (count == 0) {
// log.debug("基本信息变更失败，上传身份证正面异常，" + errorMsg); // log.debug("基本信息变更失败，上传身份证正面异常，" + errorMsg);
// String title = "收银呗商户信息变更通知"; // String title = "银收客商户信息变更通知";
// String remark = "基本信息变更失败，上传图片正面异常，" + errorMsg; // String remark = "基本信息变更失败，上传图片正面异常，" + errorMsg;
// //
// entity.setRemark(remark); // entity.setRemark(remark);
@@ -1408,7 +1408,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
// //
// if (count == 0) { // if (count == 0) {
// log.debug("基本信息变更失败，上传身份证反面异常，" + errorMsg); // log.debug("基本信息变更失败，上传身份证反面异常，" + errorMsg);
// String title = "收银呗商户信息变更通知"; // String title = "银收客商户信息变更通知";
// String remark = "基本信息变更失败，上传图片异常，" + errorMsg; // String remark = "基本信息变更失败，上传图片异常，" + errorMsg;
// //
// entity.setRemark(remark); // entity.setRemark(remark);
@@ -1431,7 +1431,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
// //
// if (count == 0) { // if (count == 0) {
// log.debug("基本信息变更失败，上传身份证反面异常，" + errorMsg); // log.debug("基本信息变更失败，上传身份证反面异常，" + errorMsg);
// String title = "收银呗商户信息变更通知"; // String title = "银收客商户信息变更通知";
// String remark = "基本信息变更失败，上传图片异常，" + errorMsg; // String remark = "基本信息变更失败，上传图片异常，" + errorMsg;
// //
// entity.setRemark(remark); // entity.setRemark(remark);
@@ -1466,7 +1466,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
// //
// mcrService.save(entity); // mcrService.save(entity);
// log.debug("云商服3.0基本信息变更发起成功"); // log.debug("云商服3.0基本信息变更发起成功");
// String title = "收银呗商户信息变更通知"; // String title = "银收客商户信息变更通知";
// String remark = "D0基本信息变更已发起"; // String remark = "D0基本信息变更已发起";
// //
// entity.setRemark(remark); // entity.setRemark(remark);
@@ -1562,7 +1562,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
// mcrService.saveOrUpdate(entity); // mcrService.saveOrUpdate(entity);
// //
// log.debug("云商服3.0基本信息变更发起成功"); // log.debug("云商服3.0基本信息变更发起成功");
// String title = "收银呗商户信息变更通知"; // String title = "银收客商户信息变更通知";
// String remark = "D0费率变更已发起"; // String remark = "D0费率变更已发起";
// //
// entity.setRemark(remark); // entity.setRemark(remark);

4
pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java
View File

@@ -274,8 +274,8 @@ public class MercOrderNewServiceImpl extends ServiceImpl<MercOrderNewMapper, Mer
if (Constant.PRIMORDIAL_CHANNEL.equals(mercOrderNew.getChannel())) { if (Constant.PRIMORDIAL_CHANNEL.equals(mercOrderNew.getChannel())) {
result.put("type", "3"); result.put("type", "3");
Map<String, String> map = new HashMap<>(16); Map<String, String> map = new HashMap<>(16);
map.put("body", "收银呗商城"); map.put("body", "银收客商城");
map.put("subject", "收银呗商城"); map.put("subject", "银收客商城");
map.put("outTradeNo", mercOrderNew.getOrderNo()); map.put("outTradeNo", mercOrderNew.getOrderNo());
map.put("totalAmount", mercOrderNew.getActualAmt().toPlainString()); map.put("totalAmount", mercOrderNew.getActualAmt().toPlainString());
Map<String, Object> payParam = aliService.appPayParam(map); Map<String, Object> payParam = aliService.appPayParam(map);

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

@@ -42,7 +42,7 @@ import java.util.Map;
/** /**
* <p> * <p>
* 收银呗缴费通收款单 服务实现类 * 银收客缴费通收款单 服务实现类
* </p> * </p>
* *
* @author crystal * @author crystal

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceStaffService.java
View File

@@ -44,7 +44,7 @@ public interface MerchantCashPlaceStaffService extends IService<MerchantCashPlac
*/ */
void offLineCashPlace(MerchantCashPlace cashPlace); void offLineCashPlace(MerchantCashPlace cashPlace);
void cutChannel(String merchantCode,String code); Boolean cutChannel(String merchantCode,String code,Integer channel);
/** /**
* 员工收银点签退 * 员工收银点签退

105
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
View File

@@ -20,6 +20,8 @@ import cn.pluss.platform.vo.MerchantCashPlaceVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.Setter; import lombok.Setter;
import lombok.val; import lombok.val;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +78,8 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
private MerchantChannelStatusService merchantChannelStatusService; private MerchantChannelStatusService merchantChannelStatusService;
@Resource @Resource
private MerchantChannelStatusMapper channelStatusMapper; private MerchantChannelStatusMapper channelStatusMapper;
@Resource
private MerchantChannelStatusExpMapper expMapper;
@Override @Override
@@ -208,19 +212,12 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
@Override @Override
public List<MerchantChannel> merchantChannel(String merchantCode,List<MerchantChannel> merchantChannels) { public List<MerchantChannel> merchantChannel(String merchantCode,List<MerchantChannel> merchantChannels) {
List<String> merchantCodes = new ArrayList<>();
if (merchantCode != null){ if (merchantCode != null){
QueryWrapper<MerchantBaseInfo> qW = new QueryWrapper<>(); QueryWrapper<MerchantChannelStatus> qW = new QueryWrapper<>();
qW.eq("masterMerchantCode",merchantCode); qW.eq("merchantCode",merchantCode);
List<MerchantBaseInfo> baseInfo = merchantBaseInfoService.list(qW); List<MerchantChannelStatus> list = merchantChannelStatusService.list(qW);
for (MerchantBaseInfo date :baseInfo) {
merchantCodes.add(date.getMerchantCode());
}
merchantCodes.add(merchantCode);
} }
List<Integer> channelByMerchantCode = channelStatusMapper.getChannelByMerchantCode(merchantCode);
List<Integer> channelByMerchantCode = channelStatusMapper.getChannelByMerchantCode(merchantCode,merchantCodes);
for (MerchantChannel data : merchantChannels) { for (MerchantChannel data : merchantChannels) {
for (Integer i :channelByMerchantCode) { for (Integer i :channelByMerchantCode) {
if (data.getId().equals(i)){ if (data.getId().equals(i)){
@@ -272,25 +269,28 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean addCashPlace(MerchantBaseInfo merchantBaseInfo) { public Boolean addCashPlace(MerchantBaseInfo merchantBaseInfo) {
//判断能不能新加收银点 //判断能不能新加收银点
MerchantBaseInfo merchantBaseInfoByMerchantCode = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantBaseInfo.getMerchantCode()); MerchantChannelStatus byMerchantCode = channelStatusMapper.getByMerchantCode(merchantBaseInfo.getMerchantCode(), merchantBaseInfo.getChannel());
if (merchantBaseInfoByMerchantCode == null){ if (byMerchantCode != null){
throw new MsgException("不能添加收银点"); throw new MsgException("不能添加收银点");
} }
//增加基本子账号
String subMerchantCode = "M800" + DateUtil.format(new Date(), "yyyyMMdd") + StringUtil.random6V2();
merchantBaseInfo.setMasterMerchantCode(merchantBaseInfo.getMerchantCode());
merchantBaseInfo.setMerchantCode(subMerchantCode);
merchantBaseInfoMapper.saveMerchantBaseInfo(merchantBaseInfo);
//增加商户通道 //增加商户通道
MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus(); MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus();
merchantChannelStatus.setMerchantCode(subMerchantCode); merchantChannelStatus.setMerchantCode(merchantBaseInfo.getMerchantCode());
merchantChannelStatus.setChannel(merchantBaseInfo.getChannel()); merchantChannelStatus.setChannel(merchantBaseInfo.getChannel());
merchantChannelStatus.setStatus("0"); merchantChannelStatus.setStatus("1");
merchantChannelStatus.setThirdStatus("-100"); merchantChannelStatus.setThirdStatus("-100");
merchantChannelStatus.setCreateTime(new Date()); merchantChannelStatus.setCreateTime(new Date());
merchantChannelStatus.setUpdateTime(new Date()); merchantChannelStatus.setUpdateTime(new Date());
boolean save = merchantChannelStatusService.save(merchantChannelStatus); Integer id = channelStatusMapper.saveChannel(merchantChannelStatus);
return save; //添加收银点
String merchantCode = "M800" + DateUtil.format(new Date(), "yyyyMMdd") + StringUtil.random6V2();
Integer integer = expMapper.saveExp(merchantChannelStatus.getId(), merchantBaseInfo.getAlias(), merchantBaseInfo.getAddress(), new Date(),merchantCode);
Boolean flag = false;
if (integer>0){
flag = true;
}
return flag;
} }
@Override @Override
@@ -373,54 +373,25 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
@Override @Override
public List<MerchantCashPlaceVO> getListForBase(Integer current, Integer size,String merchantCodes,String name) { public List<MerchantCashPlaceVO> getListForBase(Integer current, Integer size,String merchantCodes,String name) {
//分页
Page<MerchantBaseInfo> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
//查询
MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCodes);
String merchantCode = merchantBaseInfo.getMerchantCode();
QueryWrapper<MerchantBaseInfo> qW = new QueryWrapper<>();
qW.eq("masterMerchantCode",merchantCode);
qW.like(StringUtils.isNotEmpty(name), "alias", name);
qW.orderByDesc("id");
Page<MerchantBaseInfo> merchantBaseInfoPage = merchantBaseInfoMapper.selectPage(page, qW);
//组装
List<MerchantCashPlaceVO> cashPlaceVOList = new ArrayList<>();
for (MerchantBaseInfo data :merchantBaseInfoPage.getRecords()) {
MerchantCashPlaceVO cashPlaceVO = new MerchantCashPlaceVO();
cashPlaceVO.setName(data.getAlias());
cashPlaceVO.setCode(data.getMerchantCode());
cashPlaceVO.setAddress(data.getAddress());
cashPlaceVO.setCreateTime(data.getCreateDt());
cashPlaceVO.setMerchantBaseInfo(data);
cashPlaceVO.setTab(data.getTab());
cashPlaceVOList.add(cashPlaceVO);
}
if (name == null) {
//放入自己
MerchantCashPlaceVO cashPlaceVOMy = new MerchantCashPlaceVO();
cashPlaceVOMy.setName(merchantBaseInfo.getAlias());
cashPlaceVOMy.setCode(merchantBaseInfo.getMerchantCode());
cashPlaceVOMy.setAddress(merchantBaseInfo.getAddress());
cashPlaceVOMy.setCreateTime(merchantBaseInfo.getCreateDt());
cashPlaceVOMy.setMerchantBaseInfo(merchantBaseInfo);
cashPlaceVOMy.setTab(merchantBaseInfo.getTab());
cashPlaceVOList.add(cashPlaceVOMy);
//如果全为0,默认是用户号
boolean allZero = true;
for (MerchantCashPlaceVO vo : cashPlaceVOList) {
if (vo.getTab() != 0) {
allZero = false;
break;
}
}
if (allZero && !cashPlaceVOList.isEmpty()) { //分页
cashPlaceVOList.get(cashPlaceVOList.size() - 1).setTab(1); current=(current-1)*size;
//查询
List<MerchantCashPlaceVO> merchantCashPlaceVOS = channelStatusMapper.selectMerchantCode(merchantCodes, name,current,size);
//如果全为0,默认是用户号
boolean allZero = true;
for (MerchantCashPlaceVO vo : merchantCashPlaceVOS) {
if (vo.getTab() != 0) {
allZero = false;
break;
} }
} }
return cashPlaceVOList; if (allZero && !merchantCashPlaceVOS.isEmpty()) {
merchantCashPlaceVOS.get(merchantCashPlaceVOS.size() - 1).setTab(1);
}
return merchantCashPlaceVOS;
} }
@Override @Override

37
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceStaffServiceImpl.java
View File

@@ -1,18 +1,18 @@
package cn.pluss.platform.merchant.impl; package cn.pluss.platform.merchant.impl;
import cn.pluss.platform.entity.MerchantBaseInfo; import cn.pluss.platform.entity.*;
import cn.pluss.platform.entity.MerchantCashPlace;
import cn.pluss.platform.entity.MerchantCashPlaceStaff;
import cn.pluss.platform.entity.UserApp;
import cn.pluss.platform.exception.MsgException; import cn.pluss.platform.exception.MsgException;
import cn.pluss.platform.mapper.MerchantBaseInfoMapper; import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
import cn.pluss.platform.mapper.MerchantCashPlaceStaffMapper; import cn.pluss.platform.mapper.MerchantCashPlaceStaffMapper;
import cn.pluss.platform.mapper.MerchantChannelStatusExpMapper;
import cn.pluss.platform.merchant.MerchantBaseInfoService; import cn.pluss.platform.merchant.MerchantBaseInfoService;
import cn.pluss.platform.merchant.MerchantCashPlaceService; import cn.pluss.platform.merchant.MerchantCashPlaceService;
import cn.pluss.platform.merchant.MerchantCashPlaceStaffService; import cn.pluss.platform.merchant.MerchantCashPlaceStaffService;
import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
import cn.pluss.platform.userApp.UserAppService; import cn.pluss.platform.userApp.UserAppService;
import cn.pluss.platform.vo.MerchantCashPlaceStaffVO; import cn.pluss.platform.vo.MerchantCashPlaceStaffVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -50,6 +50,12 @@ public class MerchantCashPlaceStaffServiceImpl extends ServiceImpl<MerchantCashP
@Resource @Resource
private MerchantBaseInfoService merchantBaseInfoService; private MerchantBaseInfoService merchantBaseInfoService;
@Resource
private MerchantChannelStatusService merchantChannelStatusService;
@Resource
private MerchantChannelStatusExpMapper expMapper;
@Override @Override
public void bindCashPlace(Long userId, MerchantCashPlace cashPlace) { public void bindCashPlace(Long userId, MerchantCashPlace cashPlace) {
@@ -152,19 +158,26 @@ public class MerchantCashPlaceStaffServiceImpl extends ServiceImpl<MerchantCashP
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void cutChannel(String merchantCode,String code) { public Boolean cutChannel(String merchantCode,String code,Integer channel) {
MerchantBaseInfo baseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(code); MerchantBaseInfo baseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCode);
if (baseInfo == null){ if (baseInfo == null){
throw new MsgException("不能切换到该通道"); throw new MsgException("不能切换到该通道");
} }
//切换 //切换
UpdateWrapper<MerchantBaseInfo> updateWrapper1 = new UpdateWrapper<MerchantBaseInfo>() UpdateWrapper<MerchantChannelStatus> uWrapper = new UpdateWrapper<MerchantChannelStatus>();
.set("tab", 0).eq("masterMerchantCode", merchantCode).or().eq("merchantCode",merchantCode); uWrapper.eq("merchantCode", merchantCode)
merchantBaseInfoService.update(updateWrapper1); .set("valid", 0);
merchantChannelStatusService.update(uWrapper);
UpdateWrapper<MerchantBaseInfo> updateWrapper = new UpdateWrapper<MerchantBaseInfo>() if (code == null || "".equals(code)){
.set("tab", 1).eq("merchantCode", code); code=merchantCode;
merchantBaseInfoService.update(updateWrapper); }
LambdaUpdateWrapper<MerchantChannelStatus> lambdaUpdate = new LambdaUpdateWrapper<>();
lambdaUpdate.eq(MerchantChannelStatus::getMerchantCode, merchantCode)
.eq(MerchantChannelStatus::getChannel, channel)
.set(MerchantChannelStatus::getValid, 1);
boolean update = merchantChannelStatusService.update(lambdaUpdate);
return update;
} }
@Override @Override

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/MerchantChannelStatusService.java
View File

@@ -50,6 +50,8 @@ public interface MerchantChannelStatusService extends IService<MerchantChannelSt
LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
qWrapper.eq(MerchantChannelStatus::getVirChannelFlag, channelType); qWrapper.eq(MerchantChannelStatus::getVirChannelFlag, channelType);
qWrapper.eq(MerchantChannelStatus::getMerchantCode, merchantCode); qWrapper.eq(MerchantChannelStatus::getMerchantCode, merchantCode);
qWrapper.orderByDesc(MerchantChannelStatus::getId);
qWrapper.last("limit 1");
return getOne(qWrapper); return getOne(qWrapper);
} }
default MerchantChannelStatus getByMerchantCodeAndChannelTypeNew(String merchantCode, String channelType) { default MerchantChannelStatus getByMerchantCodeAndChannelTypeNew(String merchantCode, String channelType) {

4
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
View File

@@ -2251,11 +2251,11 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
// } // }
// Notice notice = new Notice(2,98,userApp); // Notice notice = new Notice(2,98,userApp);
// notice.setUniqueKey(orderNumber+userApp.getUserId()); // notice.setUniqueKey(orderNumber+userApp.getUserId());
// String content = "收银呗到账" + consumeFee + "元"; // String content = "银收客到账" + consumeFee + "元";
// notice.setConrtent(content); // notice.setConrtent(content);
// noticeService.saveOrUpdate(notice); // noticeService.saveOrUpdate(notice);
// // 会员充值播报 // // 会员充值播报
// generalPushUtil.sendAllPlatByAlias(Lists.asList(userId), "收银呗到账通知", content, extrasparam); // generalPushUtil.sendAllPlatByAlias(Lists.asList(userId), "银收客到账通知", content, extrasparam);
// } // }
@Override @Override

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitServiceImpl.java
View File

@@ -60,7 +60,7 @@ public class MerchantOrderSplitServiceImpl extends ServiceImpl<MerchantOrderSpli
String merchantCode = order.getMerchantCode(); String merchantCode = order.getMerchantCode();
MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCode); MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCode);
MerchantChannelStatus channel = channelStatusService.getByMerchantCode(order.getMerchantCode(), 4); MerchantChannelStatus channel = channelStatusService.getByMerchantCode(order.getMerchantCode(), 4);
//TODO 收银呗主体都需要走分账体系 判断是否自定义分账接口 //TODO 银收客主体都需要走分账体系 判断是否自定义分账接口
if(YsOldSrcMerchantNo.SYB.getValue().equals(channel.getSrcMerchantNo()) && merchant.getSplitFlag() == 1){ if(YsOldSrcMerchantNo.SYB.getValue().equals(channel.getSrcMerchantNo()) && merchant.getSplitFlag() == 1){
QueryWrapper<MerchantSplitSetting> queryWrapper = new QueryWrapper<MerchantSplitSetting>() QueryWrapper<MerchantSplitSetting> queryWrapper = new QueryWrapper<MerchantSplitSetting>()
.eq("chieMerchantCode",merchantCode); .eq("chieMerchantCode",merchantCode);

12
pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java
View File

@@ -214,8 +214,8 @@ public class SxfMchMachineCallbackServiceImpl implements MchMachineCallbackServi
if(flag){ if(flag){
List<String> alias = new ArrayList<>(); List<String> alias = new ArrayList<>();
alias.add(merchantBaseInfo.getUserId()); alias.add(merchantBaseInfo.getUserId());
String msgCountent = "收银呗到账" + merchantOrder.getConsumeFee().toString() + "元"; String msgCountent = "银收客到账" + merchantOrder.getConsumeFee().toString() + "元";
sendAppNotify(alias,"收银呗到账通知",msgCountent,"3"); sendAppNotify(alias,"银收客到账通知",msgCountent,"3");
try { try {
MerchantBaseInfo.setFirstAndLastTradeTime(merchantBaseInfo, merchantOrder.getUpdateTime()); MerchantBaseInfo.setFirstAndLastTradeTime(merchantBaseInfo, merchantOrder.getUpdateTime());
@@ -470,8 +470,8 @@ public class SxfMchMachineCallbackServiceImpl implements MchMachineCallbackServi
// if(flag){ // if(flag){
// List<String> alias = new ArrayList<String>(); // List<String> alias = new ArrayList<String>();
// alias.add(merchant.getUserId()); // alias.add(merchant.getUserId());
// String msgCountent = "收银呗到账" + merchantOrder.getConsumeFee().toString() + "元"; // String msgCountent = "银收客到账" + merchantOrder.getConsumeFee().toString() + "元";
// sendAppNotify(alias,"收银呗到账通知",msgCountent,"3"); // sendAppNotify(alias,"银收客到账通知",msgCountent,"3");
// } // }
if("1".equals(store.getIsMarket())){ if("1".equals(store.getIsMarket())){
merchantOrder.setMarketAmt(merchantOrder.getMercFee()); merchantOrder.setMarketAmt(merchantOrder.getMercFee());
@@ -808,8 +808,8 @@ public class SxfMchMachineCallbackServiceImpl implements MchMachineCallbackServi
if(flag && "1".equals(order.getStatus())){ if(flag && "1".equals(order.getStatus())){
List<String> alias = new ArrayList<String>(); List<String> alias = new ArrayList<String>();
alias.add(merchant.getUserId()); alias.add(merchant.getUserId());
String msgCountent = "收银呗到账" + order.getConsumeFee().toString() + "元"; String msgCountent = "银收客到账" + order.getConsumeFee().toString() + "元";
sendAppNotify(alias,"收银呗到账通知",msgCountent,"3"); sendAppNotify(alias,"银收客到账通知",msgCountent,"3");
} }
} }
} }

4
pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java
View File

@@ -315,7 +315,7 @@ public class LklMerAuditHandler {
LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery(); LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery();
qWrapper2.eq(UserApp::getUserId, baseInfo.getUserId()); qWrapper2.eq(UserApp::getUserId, baseInfo.getUserId());
UserApp userApp = uaService.getOne(qWrapper2); UserApp userApp = uaService.getOne(qWrapper2);
sendNotice(userApp, "收银呗审核通知", "拉卡拉进件成功", merchantChannelStatus.getApplicationId()); sendNotice(userApp, "银收客审核通知", "拉卡拉进件成功", merchantChannelStatus.getApplicationId());
} }
return merchantChannelStatus; return merchantChannelStatus;
@@ -345,7 +345,7 @@ public class LklMerAuditHandler {
LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery(); LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery();
qWrapper2.eq(UserApp::getUserId, baseInfo.getUserId()); qWrapper2.eq(UserApp::getUserId, baseInfo.getUserId());
UserApp userApp = uaService.getOne(qWrapper2); UserApp userApp = uaService.getOne(qWrapper2);
sendNotice(userApp, "收银呗审核通知", map.get("remark")+"", merchantChannelStatus.getApplicationId()); sendNotice(userApp, "银收客审核通知", map.get("remark")+"", merchantChannelStatus.getApplicationId());
} }
return null; return null;

4
pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java
View File

@@ -194,7 +194,7 @@ public class RyxMerAuditHandler {
mcs.setExtra(auditResult); mcs.setExtra(auditResult);
mcs.setRemark("通过"); mcs.setRemark("通过");
channelStatusService.updateById(mcs); channelStatusService.updateById(mcs);
sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", "商家审核通过", applicationId + "_" + System.currentTimeMillis()); sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", "商家审核通过", applicationId + "_" + System.currentTimeMillis());
//TODO 统计当前进件商户的上级商户是否满足费率要求 //TODO 统计当前进件商户的上级商户是否满足费率要求
try { try {
@@ -210,7 +210,7 @@ public class RyxMerAuditHandler {
mcs.setCallbackStatus("1"); mcs.setCallbackStatus("1");
mcs.setRemark(remark); mcs.setRemark(remark);
channelStatusService.updateById(mcs); channelStatusService.updateById(mcs);
sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", remark, applicationId + "_" + System.currentTimeMillis()); sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", remark, applicationId + "_" + System.currentTimeMillis());
} }
boolean isCurrentSign = mcs.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN); boolean isCurrentSign = mcs.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN);

6
pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
View File

@@ -219,7 +219,7 @@ public class SxfMerAuditHandler {
String pushMsg = "商家审核通过"; String pushMsg = "商家审核通过";
String uniqueKey = auditResult.getString("applicationId") + System.currentTimeMillis(); String uniqueKey = auditResult.getString("applicationId") + System.currentTimeMillis();
sendNotice(userApp, "收银呗审核通知", pushMsg, uniqueKey); sendNotice(userApp, "银收客审核通知", pushMsg, uniqueKey);
mcsMapper.updateById(merchantChannelStatus); mcsMapper.updateById(merchantChannelStatus);
//TODO 统计当前进件商户的上级商户是否满足费率要求 //TODO 统计当前进件商户的上级商户是否满足费率要求
@@ -253,7 +253,7 @@ public class SxfMerAuditHandler {
merchantChannelStatus.setRemark(auditResult.getString("suggestion")); merchantChannelStatus.setRemark(auditResult.getString("suggestion"));
String uniqueKey = auditResult.getString("applicationId") + "_" + auditResult.getString("timeStamp"); String uniqueKey = auditResult.getString("applicationId") + "_" + auditResult.getString("timeStamp");
sendNotice(userApp, "收银呗审核通知", pushMsg, uniqueKey); sendNotice(userApp, "银收客审核通知", pushMsg, uniqueKey);
mcsMapper.updateById(merchantChannelStatus); mcsMapper.updateById(merchantChannelStatus);
} }
@@ -280,7 +280,7 @@ public class SxfMerAuditHandler {
String pushMsg = auditResult.getString("suggestion"); String pushMsg = auditResult.getString("suggestion");
merchantChannelStatus.setRemark(pushMsg); merchantChannelStatus.setRemark(pushMsg);
String uniqueKey = auditResult.getString("applicationId") + "_" + auditResult.getString("timeStamp"); String uniqueKey = auditResult.getString("applicationId") + "_" + auditResult.getString("timeStamp");
sendNotice(userApp, "收银呗审核通知", pushMsg, uniqueKey); sendNotice(userApp, "银收客审核通知", pushMsg, uniqueKey);
mcsMapper.updateById(merchantChannelStatus); mcsMapper.updateById(merchantChannelStatus);
} }

2
pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditV2Handler.java
View File

@@ -105,7 +105,7 @@ public class YsMerAuditV2Handler extends BaseMerAuditHandler<YsMerAuditV2Handler
qWrapper2.eq(UserApp::getUserType, "promoter"); qWrapper2.eq(UserApp::getUserType, "promoter");
UserApp userApp = userAppMapper.selectOne(qWrapper2); UserApp userApp = userAppMapper.selectOne(qWrapper2);
String pushMsg = "D0通道报备失败，请联系客服进行处理"; String pushMsg = "D0通道报备失败，请联系客服进行处理";
sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", pushMsg, mcs.getApplicationId()); sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", pushMsg, mcs.getApplicationId());
} }
} }

10
pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
View File

@@ -172,14 +172,14 @@ public class GeneralPushUtil implements IPush {
// alias.add("7266"); // alias.add("7266");
// alias.add("33651"); // alias.add("33651");
// sendAndroidByAlias(alias, "收银呗", "您有一笔催单请及时处理", "3"); // sendAndroidByAlias(alias, "银收客", "您有一笔催单请及时处理", "3");
// sendAndroidByAlias(alias, "收银呗", "您有一个新的呼叫服务请及时处理", "3"); // sendAndroidByAlias(alias, "银收客", "您有一个新的呼叫服务请及时处理", "3");
// sendAndroidByAlias(alias, "收银呗", "收银呗线上店订单来了请及时处理", "3"); // sendAndroidByAlias(alias, "银收客", "银收客线上店订单来了请及时处理", "3");
// new GetuiConfig().init(); // new GetuiConfig().init();
// sendAllPlatByAlias(alias, "收银呗", "收银呗到账100.00元", "3"); // sendAllPlatByAlias(alias, "银收客", "银收客到账100.00元", "3");
System.out.println("=========over========"); System.out.println("=========over========");
// sendIOSAll("收银呗", "收银呗到账100022.00元", "3"); // sendIOSAll("银收客", "银收客到账100022.00元", "3");
} }
} }

10
pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java
View File

@@ -1382,8 +1382,8 @@ public class UserAppServiceImpl extends ServiceImpl<UserAppMapper, UserApp> impl
merchantOrderMapper.insert(merchantOrder); merchantOrderMapper.insert(merchantOrder);
Map<String, String> map = new HashMap<>(16); Map<String, String> map = new HashMap<>(16);
map.put("body", "收银呗商城充值"); map.put("body", "银收客商城充值");
map.put("subject", "收银呗商城充值"); map.put("subject", "银收客商城充值");
map.put("outTradeNo", orderNumber); map.put("outTradeNo", orderNumber);
map.put("totalAmount", split[0]); map.put("totalAmount", split[0]);
@@ -1599,8 +1599,8 @@ public class UserAppServiceImpl extends ServiceImpl<UserAppMapper, UserApp> impl
merchantOrderMapper.insert(merchantOrder); merchantOrderMapper.insert(merchantOrder);
Map<String, String> map = new HashMap<>(16); Map<String, String> map = new HashMap<>(16);
map.put("body", "收银呗商城充值"); map.put("body", "银收客商城充值");
map.put("subject", "收银呗商城充值"); map.put("subject", "银收客商城充值");
map.put("outTradeNo", orderNumber); map.put("outTradeNo", orderNumber);
map.put("totalAmount", targetFee.toPlainString()); map.put("totalAmount", targetFee.toPlainString());
@@ -1807,7 +1807,7 @@ public class UserAppServiceImpl extends ServiceImpl<UserAppMapper, UserApp> impl
UserInfo ui = userInfoService.getById(parentApp.getUserId()); UserInfo ui = userInfoService.getById(parentApp.getUserId());
if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) { if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉"); throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系银收客客服申诉");
} }
if (!"1".equals(parentApp.getSpreadFlag())) { if (!"1".equals(parentApp.getSpreadFlag())) {

4
pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
View File

@@ -143,7 +143,7 @@ public abstract class BaseUserInfoService extends ServiceImpl<UserInfoMapper, Us
UserInfo ui = getById(agentUa.getUserId()); UserInfo ui = getById(agentUa.getUserId());
if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) { if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉"); throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系银收客客服申诉");
} }
} else { } else {
if (!Objects.equals(pUserApp.getStatus(), 3) || !Objects.equals(pUserApp.getBankStatus(), 3)) { if (!Objects.equals(pUserApp.getStatus(), 3) || !Objects.equals(pUserApp.getBankStatus(), 3)) {
@@ -152,7 +152,7 @@ public abstract class BaseUserInfoService extends ServiceImpl<UserInfoMapper, Us
UserInfo ui = getById(pUserApp.getUserId()); UserInfo ui = getById(pUserApp.getUserId());
if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) { if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉"); throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系银收客客服申诉");
} }
// if (!"1".equals(pUserApp.getSpreadFlag())) { // if (!"1".equals(pUserApp.getSpreadFlag())) {

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsConfig.java
View File

@@ -36,7 +36,7 @@ public class YsConfig {
private String oldPubKey; private String oldPubKey;
//收银呗（武汉）科技有限公司 //银收客（武汉）科技有限公司
private YsOldPayV2 oldPayV2; private YsOldPayV2 oldPayV2;
/** /**

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

@@ -141,7 +141,7 @@ public class YsAuditServiceImpl extends AbYsAuditResultService {
bizReqJson.put(YSConstants.CONTACT_REGION, distinct); bizReqJson.put(YSConstants.CONTACT_REGION, distinct);
} }
bizReqJson.put(YSConstants.BIZ_NAME, "收银呗"); bizReqJson.put(YSConstants.BIZ_NAME, "银收客");
bizReqJson.put(YSConstants.MCC_CODE, mbi.getMcc()); bizReqJson.put(YSConstants.MCC_CODE, mbi.getMcc());
bizReqJson.put(YSConstants.MER_TYPE, YSConstants.getMerchantType(mbi.getMerchantType())); bizReqJson.put(YSConstants.MER_TYPE, YSConstants.getMerchantType(mbi.getMerchantType()));
bizReqJson.put(YSConstants.WX_RATE, 0.38); bizReqJson.put(YSConstants.WX_RATE, 0.38);

4
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/AbstractYsResultService.java
View File

@@ -190,7 +190,7 @@ public abstract class AbstractYsResultService extends AbstractYsImgUploadService
qWrapper2.eq(UserApp::getMerchantCode, mcs.getMerchantCode()); qWrapper2.eq(UserApp::getMerchantCode, mcs.getMerchantCode());
qWrapper2.eq(UserApp::getUserType, "promoter"); qWrapper2.eq(UserApp::getUserType, "promoter");
UserApp userApp = uaService.getOne(qWrapper2); UserApp userApp = uaService.getOne(qWrapper2);
sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", pushMsg, mcs.getApplicationId()); sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", pushMsg, mcs.getApplicationId());
// 因为接口进件费率与默认进件费率不一致，所以这里将费率存下来 // 因为接口进件费率与默认进件费率不一致，所以这里将费率存下来
try { try {
@@ -254,7 +254,7 @@ public abstract class AbstractYsResultService extends AbstractYsImgUploadService
qWrapper2.eq(UserApp::getUserType, "promoter"); qWrapper2.eq(UserApp::getUserType, "promoter");
UserApp userApp = uaService.getOne(qWrapper2); UserApp userApp = uaService.getOne(qWrapper2);
String uniqueKey = sysFlowId + System.currentTimeMillis(); String uniqueKey = sysFlowId + System.currentTimeMillis();
sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", remark, uniqueKey); sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", remark, uniqueKey);
} }
private MerchantChannelStatus getMcsInfoByAppId(String applicationId) { private MerchantChannelStatus getMcsInfoByAppId(String applicationId) {

6
pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/AbstractYsResultService.java
View File

@@ -122,7 +122,7 @@ public abstract class AbstractYsResultService extends AbstractYsImgUploadService
qWrapper2.eq(UserApp::getUserType, "promoter"); qWrapper2.eq(UserApp::getUserType, "promoter");
UserApp userApp = uaService.getOne(qWrapper2); UserApp userApp = uaService.getOne(qWrapper2);
sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", pushMsg, jpc.getApplicationId()); sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", pushMsg, jpc.getApplicationId());
} }
@@ -151,7 +151,7 @@ public abstract class AbstractYsResultService extends AbstractYsImgUploadService
qWrapper2.eq(UserApp::getUserId, jpc.getUserId()); qWrapper2.eq(UserApp::getUserId, jpc.getUserId());
UserApp userApp = uaService.getOne(qWrapper2); UserApp userApp = uaService.getOne(qWrapper2);
sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", pushMsg, jpc.getApplicationId()); sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", pushMsg, jpc.getApplicationId());
} }
@@ -171,7 +171,7 @@ public abstract class AbstractYsResultService extends AbstractYsImgUploadService
qWrapper2.eq(UserApp::getUserType, "promoter"); qWrapper2.eq(UserApp::getUserType, "promoter");
UserApp userApp = uaService.getOne(qWrapper2); UserApp userApp = uaService.getOne(qWrapper2);
String uniqueKey = sysFlowId + System.currentTimeMillis(); String uniqueKey = sysFlowId + System.currentTimeMillis();
sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", "缴费通审核不通过: " + data.getString("nogoRemark"), uniqueKey); sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", "缴费通审核不通过: " + data.getString("nogoRemark"), uniqueKey);
} }

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl.java
View File

@@ -382,7 +382,7 @@ public class YsAuditServiceImpl extends AbstractYsResultService {
param.put(YsConstant.MERC_LVL, "1"); param.put(YsConstant.MERC_LVL, "1");
param.put(YsConstant.CONTACTS_ADDR, jbi.getAddress()); param.put(YsConstant.CONTACTS_ADDR, jbi.getAddress());
param.put(YsConstant.BALANCE_ACC_TYPE, "11"); param.put(YsConstant.BALANCE_ACC_TYPE, "11");
param.put(YsConstant.EXPANDING_MANAGER, "收银呗"); param.put(YsConstant.EXPANDING_MANAGER, "银收客");
JSONObject data = ysServiceV2.req(YsConfigExtensionV2.MER_AUDIT, ReqMethod.MERCHANT_ADD, param); JSONObject data = ysServiceV2.req(YsConfigExtensionV2.MER_AUDIT, ReqMethod.MERCHANT_ADD, param);
RespEntity respEntity = JSON.toJavaObject(data, RespEntity.class); RespEntity respEntity = JSON.toJavaObject(data, RespEntity.class);

10
pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java
View File

@@ -2029,7 +2029,7 @@ public class MerchantController {
result.put("userImg", userImg); result.put("userImg", userImg);
result.put("nickName", nickName); result.put("nickName", nickName);
String storeName = "收银呗商家"; String storeName = "银收客商家";
UserApp userApp = new UserApp(); UserApp userApp = new UserApp();
userApp.setUserId(Long.parseLong(userAppId)); userApp.setUserId(Long.parseLong(userAppId));
userApp = userAppService.queryUserApp(userApp); userApp = userAppService.queryUserApp(userApp);
@@ -3067,8 +3067,8 @@ public class MerchantController {
// log.info("=========推送人userId======" + JSON.toJSONString(aliass) + "=========金额=======" + amount); // log.info("=========推送人userId======" + JSON.toJSONString(aliass) + "=========金额=======" + amount);
// aliass.add(userId); // aliass.add(userId);
// //
// GeneralPushUtil.sendAllPlatByAlias(aliass, "收银呗到账通知", "收银呗到账" + amount + "元", "3"); // GeneralPushUtil.sendAllPlatByAlias(aliass, "银收客到账通知", "银收客到账" + amount + "元", "3");
// log.debug("===============================收银呗到账" + amount + "元"); // log.debug("===============================银收客到账" + amount + "元");
// } // }
// SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// merchantOrder.setTransDt(sFormat.parse(pay_time)); // merchantOrder.setTransDt(sFormat.parse(pay_time));
@@ -3152,8 +3152,8 @@ public class MerchantController {
// log.debug("=================ji guang tuisong==========================================="); // log.debug("=================ji guang tuisong===========================================");
// List<String> aliass = userAppService.storeMemberList(merchantCode); // List<String> aliass = userAppService.storeMemberList(merchantCode);
// //
// GeneralPushUtil.sendAllPlatByAlias(aliass, "收银呗到账通知", "收银呗到账" + amount + "元", "3"); // GeneralPushUtil.sendAllPlatByAlias(aliass, "银收客到账通知", "银收客到账" + amount + "元", "3");
// log.debug("===============================收银呗到账" + amount + "元"); // log.debug("===============================银收客到账" + amount + "元");
// } // }
// } // }
// } // }

2
pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/VIPController.java
View File

@@ -1764,7 +1764,7 @@ public class VIPController {
baseInfo.put("logo_url","http://mmbiz.qpic.cn/mmbiz/p98FjXy8LacgHxp3sJ3vn97bGLz0ib0Sfz1bjiaoOYA027iasqSG0sjpiby4vce3AtaPu6cIhBHkt6IjlkY9YnDsfw/0"); baseInfo.put("logo_url","http://mmbiz.qpic.cn/mmbiz/p98FjXy8LacgHxp3sJ3vn97bGLz0ib0Sfz1bjiaoOYA027iasqSG0sjpiby4vce3AtaPu6cIhBHkt6IjlkY9YnDsfw/0");
baseInfo.put("brand_name","收银呗"); baseInfo.put("brand_name","银收客");
baseInfo.put("code_type","CODE_TYPE_TEXT"); baseInfo.put("code_type","CODE_TYPE_TEXT");
baseInfo.put("title","白金尊贵会员卡"); baseInfo.put("title","白金尊贵会员卡");
baseInfo.put("color","Color010"); baseInfo.put("color","Color010");