diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java index 3e7c87a..9eb3398 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java @@ -159,8 +159,12 @@ public class MerchantCashPlaceController { */ @GetMapping("/cutChannel") public Result cutChannel(@RequestParam String merchantCode, - @RequestParam String code){ - cashPlaceStaffService.cutChannel(merchantCode, code); - return ResultGenerator.genSuccessResult(); + @RequestParam String code, + @RequestParam Integer channel){ + Boolean aBoolean = cashPlaceStaffService.cutChannel(merchantCode, code, channel); + if (aBoolean){ + return ResultGenerator.genSuccessResult(); + } + return ResultGenerator.genFailResult("无法切换该通道"); } } \ No newline at end of file diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java index 35cc175..c036202 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java @@ -246,25 +246,25 @@ public class ParameterConfig { public String LESHUALIU; /** - * 收银呗微信普通商户APPID + * 银收客微信普通商户APPID */ @Value("${parameter.MERCHANT_APPID}") public String MERCHANT_APPID; /** - * 收银呗微信普通商户Appsecret + * 银收客微信普通商户Appsecret */ @Value("${parameter.MERCHANT_APPSECRET}") public String MERCHANT_APPSECRET; /** - * 收银呗微信普通商户号 + * 银收客微信普通商户号 */ @Value("${parameter.MERCHANT_PID}") public String MERCHANT_PID; /** - * 收银呗微信普通商户key + * 银收客微信普通商户key */ @Value("${parameter.MERCHANT_KEY}") public String MERCHANT_KEY; diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxPayNotice.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxPayNotice.java index 222e081..0e7cdeb 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxPayNotice.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxPayNotice.java @@ -32,7 +32,7 @@ public class JtyYxPayNotice { * 支付方式 * 10001 支付宝 * 10002 微信 - * 10003 收银呗 + * 10003 银收客 */ private String payType; diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java index e85f161..abc505d 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java @@ -17,7 +17,7 @@ public class HttpUtils { String userAgent = request.getHeader("user-agent"); /** - * 仅适用于收银呗app + * 仅适用于银收客app */ return userAgent.contains("iOS"); } diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JpushClientUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JpushClientUtil.java index 2781ce1..36c8cc6 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JpushClientUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JpushClientUtil.java @@ -44,7 +44,7 @@ public class JpushClientUtil { // sendToAllAndroid("测试Android", "测试Android", "测试Android", "https://www.baidu.com"); // sendToAllIos("测试Ios", "测试信息Ios", "测试信息Ios", "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("发送成功！"); } diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushClient.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushClient.java index 6954ce0..68a8145 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushClient.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushClient.java @@ -49,7 +49,7 @@ public class MobPushClient { push.setPushTarget(pushTarget); Result pushV3ResResult = PushV3Client.pushTaskV3(push); System.out.println(DateUtils.formatDateDefault(new Date(), "yyyy-MM-dd HH:mm:ss")); - //Result result = PushV3Client.pushByRids(null,"收银呗到账","收银呗到账1000.00元","65kyb6mmvuxvaio"); + //Result result = PushV3Client.pushByRids(null,"银收客到账","银收客到账1000.00元","65kyb6mmvuxvaio"); System.out.println(pushV3ResResult); return true; } diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java index a6799b2..8926209 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java @@ -169,34 +169,34 @@ public class ParametersUtil { public static String LESHUALIU; /** - * 收银呗微信普通商户APPID + * 银收客微信普通商户APPID */ public static String MERCHANT_APPID; /** - * 收银呗微信普通商户Appsecret + * 银收客微信普通商户Appsecret */ public static String MERCHANT_APPSECRET; /** - * 收银呗微信普通商户号 + * 银收客微信普通商户号 */ public static String MERCHANT_PID; /** - * 收银呗微信普通商户key + * 银收客微信普通商户key */ public static String MERCHANT_KEY; public static String LESHUA_API; /** - * @description:收银呗商家公众号APPID + * @description:银收客商家公众号APPID * @date: 2021/9/23 10:27 */ public static String SJ_APPID; /** - * @description:收银呗商家公众号APPSECRET + * @description:银收客商家公众号APPSECRET * @date: 2021/9/23 10:27 */ public static String SJ_APPSECRET; diff --git a/pluss-common-bundle/src/main/resources/config/application-ys.yml b/pluss-common-bundle/src/main/resources/config/application-ys.yml index c5b6bf6..d02b22e 100644 --- a/pluss-common-bundle/src/main/resources/config/application-ys.yml +++ b/pluss-common-bundle/src/main/resources/config/application-ys.yml @@ -35,11 +35,11 @@ ys: ## 加密密钥 encryptPwd: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD2J82Gg79Tk8HZ9Zl7EOeLwvUn41c4ktUg6jveIhYLhT oldPayV2: - ## 交易发起方编号 收银呗（武汉）科技有限公司 + ## 交易发起方编号 银收客（武汉）科技有限公司 srcMerchantNo: - ## 收银呗（武汉）科技有限公司 私钥 + ## 银收客（武汉）科技有限公司 私钥 payPriKey: - ## 收银呗公钥 + ## 银收客公钥 sybPubKey: # 银盛公钥 payPubKey: diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptInfoMapper.java index 2547874..71c3853 100644 --- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptInfoMapper.java +++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptInfoMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Select; /** *

- * 收银呗缴费通收款单 Mapper 接口 + * 银收客缴费通收款单 Mapper 接口 *

* * @author crystal diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java index 59a6cae..02fe357 100644 --- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java +++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java @@ -1,10 +1,7 @@ package cn.pluss.platform.mapper; import cn.pluss.platform.entity.MerchantChannelStatus; -import cn.pluss.platform.vo.ChannelStatusVO; -import cn.pluss.platform.vo.MerchantChannelStatusVO; -import cn.pluss.platform.vo.UserNumVO; -import cn.pluss.platform.vo.merchantChannelVO; +import cn.pluss.platform.vo.*; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -40,6 +37,9 @@ public interface MerchantChannelStatusMapper extends BaseMapper selectListWithUserId(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List 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 ") MerchantChannelStatus getByMerchantIdLock(@Param("merchantId") String merchantId); @@ -54,5 +54,6 @@ public interface MerchantChannelStatusMapper extends BaseMapper pageDate(@Param("pageSize")Integer size, @Param("offset")Integer page); - List getChannelByMerchantCode(@Param("merchantCode") String merchantCode,@Param("merchantCodeList") List merchantCodeList); + List getChannelByMerchantCode(@Param("merchantCode") String merchantCode); + Integer saveChannel(MerchantChannelStatus merchantChannelStatus); } diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml index a700d56..fbdf6c7 100644 --- a/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml +++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml @@ -90,9 +90,34 @@ order by mcs.id desc limit #{pageSize} offset #{offset}; + + + + insert into tb_pluss_merchant_channel_status(merchantCode, channel, status, thirdStatus, createTime, updateTime) + VALUES (#{merchantCode}, #{channel}, #{status}, #{thirdStatus}, #{createTime}, #{updateTime}) + diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptInfo.java index 0fb4245..2f5777d 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptInfo.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptInfo.java @@ -21,7 +21,7 @@ import java.util.UUID; /** *

- * 收银呗缴费通收款单 + * 银收客缴费通收款单 *

* * @author crystal diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMemberCode.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMemberCode.java index d3fff47..bde925c 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMemberCode.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMemberCode.java @@ -66,7 +66,7 @@ public class MerchantMemberCode implements Serializable { private Date startTime; /** - * 收银呗门店ID + * 银收客门店ID */ @TableField(exist = false) private Long storeId; diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/SubAppLetInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/SubAppLetInfo.java index 288636f..36da8d8 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/SubAppLetInfo.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/SubAppLetInfo.java @@ -18,7 +18,7 @@ public enum SubAppLetInfo { CSY("wx79b08abe2c635a78","f885694fa1cb93656b72db34f3dae211","仓鼠云收银台小程序"), MIMA("wx4dce83e9d6d42a6c","09d0ec30f8da544e396ad0b716f120f6","密码收银台小程序"), TR("wx6639bea0f0c6d648","d060a877a09b48a8dc42f2eb66e08b25","天润收银小程序"), - SYB("wxaa8c9e6857a265e1","2ca82f68f5fa680bc6fc924fd22bd52d","收银呗智慧收银小程序"); + SYB("wxaa8c9e6857a265e1","2ca82f68f5fa680bc6fc924fd22bd52d","银收客智慧收银小程序"); private String appid; diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopValidTask.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopValidTask.java index 6046d3d..48688a4 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopValidTask.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopValidTask.java @@ -22,9 +22,9 @@ public class JfShopValidTask extends JfShopCommon { * 02：订单微信推送 * 03：使用一次帮助中心 * 04：查看一次产品手册 - * 05：本月使用收银呗收款3天 - * 06：本月使用收银呗收款7天 - * 07：本月使用收银呗收款15天 + * 05：本月使用银收客收款3天 + * 06：本月使用银收客收款7天 + * 07：本月使用银收客收款15天 */ private String taskType; diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceVO.java index 47e8b07..5633a9f 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceVO.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceVO.java @@ -37,7 +37,10 @@ public class MerchantCashPlaceVO implements Serializable { * 收银点地址 */ private String address; - + /** + * 通道id + */ + private Integer channel; /** * 备注 diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/YsOldSrcMerchantNo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/YsOldSrcMerchantNo.java index a06320a..dcd2ebd 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/YsOldSrcMerchantNo.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/YsOldSrcMerchantNo.java @@ -16,7 +16,7 @@ public enum YsOldSrcMerchantNo { RSCY("826521773920170","wxaa8c9e6857a265e1","gh_5a1aa6143567","融商创赢(发起方)"), - SYB("826521673920090","wxc2ecf9662691832e","gh_d0571a5c903e","收银呗(发起方)"); + SYB("826521673920090","wxc2ecf9662691832e","gh_d0571a5c903e","银收客(发起方)"); private String value; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AlipayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AlipayServiceImpl.java index f343885..ce7e5ea 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AlipayServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AlipayServiceImpl.java @@ -80,11 +80,11 @@ public class AlipayServiceImpl implements AlipayService { bizJson.put("product_code", "TRANS_ACCOUNT_NO_PWD"); bizJson.put("biz_scene", "DIRECT_TRANSFER"); bizJson.put("payee_info", payeeInfo); - bizJson.put("order_title", "收银呗分润"); - bizJson.put("remark", "收银呗分润"); + bizJson.put("order_title", "银收客分润"); + bizJson.put("remark", "银收客分润"); JSONObject bizParam = new JSONObject(); - bizParam.put("payer_show_name", "收银呗"); + bizParam.put("payer_show_name", "银收客"); bizJson.put("business_params", bizParam); 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 a59dbe1..9dee8b9 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 @@ -1314,7 +1314,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer // imageEditUpload(MerchantImage.ImageType.CHANGE_FORM, applyImg, changeSysFlowId); // // log.debug("云商服3.0基本信息变更发起成功"); -// String title = "收银呗商户信息变更通知"; +// String title = "银收客商户信息变更通知"; // String remark = "D0结算信息变更已发起"; // // entity.setRemark(remark); @@ -1384,7 +1384,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer // // if (count == 0) { // log.debug("基本信息变更失败，上传身份证正面异常，" + errorMsg); -// String title = "收银呗商户信息变更通知"; +// String title = "银收客商户信息变更通知"; // String remark = "基本信息变更失败，上传图片正面异常，" + errorMsg; // // entity.setRemark(remark); @@ -1408,7 +1408,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer // // if (count == 0) { // log.debug("基本信息变更失败，上传身份证反面异常，" + errorMsg); -// String title = "收银呗商户信息变更通知"; +// String title = "银收客商户信息变更通知"; // String remark = "基本信息变更失败，上传图片异常，" + errorMsg; // // entity.setRemark(remark); @@ -1431,7 +1431,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer // // if (count == 0) { // log.debug("基本信息变更失败，上传身份证反面异常，" + errorMsg); -// String title = "收银呗商户信息变更通知"; +// String title = "银收客商户信息变更通知"; // String remark = "基本信息变更失败，上传图片异常，" + errorMsg; // // entity.setRemark(remark); @@ -1466,7 +1466,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer // // mcrService.save(entity); // log.debug("云商服3.0基本信息变更发起成功"); -// String title = "收银呗商户信息变更通知"; +// String title = "银收客商户信息变更通知"; // String remark = "D0基本信息变更已发起"; // // entity.setRemark(remark); @@ -1562,7 +1562,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer // mcrService.saveOrUpdate(entity); // // log.debug("云商服3.0基本信息变更发起成功"); -// String title = "收银呗商户信息变更通知"; +// String title = "银收客商户信息变更通知"; // String remark = "D0费率变更已发起"; // // entity.setRemark(remark); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java index 8a41459..4d22324 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java @@ -274,8 +274,8 @@ public class MercOrderNewServiceImpl extends ServiceImpl map = new HashMap<>(16); - map.put("body", "收银呗商城"); - map.put("subject", "收银呗商城"); + map.put("body", "银收客商城"); + map.put("subject", "银收客商城"); map.put("outTradeNo", mercOrderNew.getOrderNo()); map.put("totalAmount", mercOrderNew.getActualAmt().toPlainString()); Map payParam = aliService.appPayParam(map); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptInfoServiceImpl.java index 51fe5dd..41039d9 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptInfoServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptInfoServiceImpl.java @@ -42,7 +42,7 @@ import java.util.Map; /** *

- * 收银呗缴费通收款单 服务实现类 + * 银收客缴费通收款单 服务实现类 *

* * @author crystal diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceStaffService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceStaffService.java index d8dab52..b3f8c9d 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceStaffService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceStaffService.java @@ -44,7 +44,7 @@ public interface MerchantCashPlaceStaffService extends IService merchantChannel(String merchantCode,List merchantChannels) { - List merchantCodes = new ArrayList<>(); - if (merchantCode != null){ - QueryWrapper qW = new QueryWrapper<>(); - qW.eq("masterMerchantCode",merchantCode); - List baseInfo = merchantBaseInfoService.list(qW); - for (MerchantBaseInfo date :baseInfo) { - merchantCodes.add(date.getMerchantCode()); - } - merchantCodes.add(merchantCode); + QueryWrapper qW = new QueryWrapper<>(); + qW.eq("merchantCode",merchantCode); + List list = merchantChannelStatusService.list(qW); } - - List channelByMerchantCode = channelStatusMapper.getChannelByMerchantCode(merchantCode,merchantCodes); + List channelByMerchantCode = channelStatusMapper.getChannelByMerchantCode(merchantCode); for (MerchantChannel data : merchantChannels) { for (Integer i :channelByMerchantCode) { if (data.getId().equals(i)){ @@ -272,25 +269,28 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl0){ + flag = true; + } + + return flag; } @Override @@ -373,54 +373,25 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl getListForBase(Integer current, Integer size,String merchantCodes,String name) { - //分页 - Page page = new Page<>(); - page.setCurrent(current); - page.setSize(size); - //查询 - MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCodes); - String merchantCode = merchantBaseInfo.getMerchantCode(); - QueryWrapper qW = new QueryWrapper<>(); - qW.eq("masterMerchantCode",merchantCode); - qW.like(StringUtils.isNotEmpty(name), "alias", name); - qW.orderByDesc("id"); - Page merchantBaseInfoPage = merchantBaseInfoMapper.selectPage(page, qW); - //组装 - List 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 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 diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceStaffServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceStaffServiceImpl.java index 13f4bdd..9a5b349 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceStaffServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceStaffServiceImpl.java @@ -1,18 +1,18 @@ package cn.pluss.platform.merchant.impl; -import cn.pluss.platform.entity.MerchantBaseInfo; -import cn.pluss.platform.entity.MerchantCashPlace; -import cn.pluss.platform.entity.MerchantCashPlaceStaff; -import cn.pluss.platform.entity.UserApp; +import cn.pluss.platform.entity.*; import cn.pluss.platform.exception.MsgException; import cn.pluss.platform.mapper.MerchantBaseInfoMapper; import cn.pluss.platform.mapper.MerchantCashPlaceStaffMapper; +import cn.pluss.platform.mapper.MerchantChannelStatusExpMapper; import cn.pluss.platform.merchant.MerchantBaseInfoService; import cn.pluss.platform.merchant.MerchantCashPlaceService; import cn.pluss.platform.merchant.MerchantCashPlaceStaffService; +import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService; import cn.pluss.platform.userApp.UserAppService; import cn.pluss.platform.vo.MerchantCashPlaceStaffVO; 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.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -50,6 +50,12 @@ public class MerchantCashPlaceStaffServiceImpl extends ServiceImpl updateWrapper1 = new UpdateWrapper() - .set("tab", 0).eq("masterMerchantCode", merchantCode).or().eq("merchantCode",merchantCode); - merchantBaseInfoService.update(updateWrapper1); + UpdateWrapper uWrapper = new UpdateWrapper(); + uWrapper.eq("merchantCode", merchantCode) + .set("valid", 0); + merchantChannelStatusService.update(uWrapper); - UpdateWrapper updateWrapper = new UpdateWrapper() - .set("tab", 1).eq("merchantCode", code); - merchantBaseInfoService.update(updateWrapper); + if (code == null || "".equals(code)){ + code=merchantCode; + } + LambdaUpdateWrapper lambdaUpdate = new LambdaUpdateWrapper<>(); + lambdaUpdate.eq(MerchantChannelStatus::getMerchantCode, merchantCode) + .eq(MerchantChannelStatus::getChannel, channel) + .set(MerchantChannelStatus::getValid, 1); + boolean update = merchantChannelStatusService.update(lambdaUpdate); + return update; } @Override diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/MerchantChannelStatusService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/MerchantChannelStatusService.java index e0ba60a..a2cfc54 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/MerchantChannelStatusService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/MerchantChannelStatusService.java @@ -50,6 +50,8 @@ public interface MerchantChannelStatusService extends IService qWrapper = Wrappers.lambdaQuery(); qWrapper.eq(MerchantChannelStatus::getVirChannelFlag, channelType); qWrapper.eq(MerchantChannelStatus::getMerchantCode, merchantCode); + qWrapper.orderByDesc(MerchantChannelStatus::getId); + qWrapper.last("limit 1"); return getOne(qWrapper); } default MerchantChannelStatus getByMerchantCodeAndChannelTypeNew(String merchantCode, String channelType) { diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java index ea69386..a3d8a39 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java @@ -2251,11 +2251,11 @@ public class MerchantOrderServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper() .eq("chieMerchantCode",merchantCode); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java index 0782282..baa63c7 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java @@ -214,8 +214,8 @@ public class SxfMchMachineCallbackServiceImpl implements MchMachineCallbackServi if(flag){ List alias = new ArrayList<>(); alias.add(merchantBaseInfo.getUserId()); - String msgCountent = "收银呗到账" + merchantOrder.getConsumeFee().toString() + "元"; - sendAppNotify(alias,"收银呗到账通知",msgCountent,"3"); + String msgCountent = "银收客到账" + merchantOrder.getConsumeFee().toString() + "元"; + sendAppNotify(alias,"银收客到账通知",msgCountent,"3"); try { MerchantBaseInfo.setFirstAndLastTradeTime(merchantBaseInfo, merchantOrder.getUpdateTime()); @@ -470,8 +470,8 @@ public class SxfMchMachineCallbackServiceImpl implements MchMachineCallbackServi // if(flag){ // List alias = new ArrayList(); // alias.add(merchant.getUserId()); -// String msgCountent = "收银呗到账" + merchantOrder.getConsumeFee().toString() + "元"; -// sendAppNotify(alias,"收银呗到账通知",msgCountent,"3"); +// String msgCountent = "银收客到账" + merchantOrder.getConsumeFee().toString() + "元"; +// sendAppNotify(alias,"银收客到账通知",msgCountent,"3"); // } if("1".equals(store.getIsMarket())){ merchantOrder.setMarketAmt(merchantOrder.getMercFee()); @@ -808,8 +808,8 @@ public class SxfMchMachineCallbackServiceImpl implements MchMachineCallbackServi if(flag && "1".equals(order.getStatus())){ List alias = new ArrayList(); alias.add(merchant.getUserId()); - String msgCountent = "收银呗到账" + order.getConsumeFee().toString() + "元"; - sendAppNotify(alias,"收银呗到账通知",msgCountent,"3"); + String msgCountent = "银收客到账" + order.getConsumeFee().toString() + "元"; + sendAppNotify(alias,"银收客到账通知",msgCountent,"3"); } } } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java index b13a6c5..b336947 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java @@ -315,7 +315,7 @@ public class LklMerAuditHandler { LambdaQueryWrapper qWrapper2 = Wrappers.lambdaQuery(); qWrapper2.eq(UserApp::getUserId, baseInfo.getUserId()); UserApp userApp = uaService.getOne(qWrapper2); - sendNotice(userApp, "收银呗审核通知", "拉卡拉进件成功", merchantChannelStatus.getApplicationId()); + sendNotice(userApp, "银收客审核通知", "拉卡拉进件成功", merchantChannelStatus.getApplicationId()); } return merchantChannelStatus; @@ -345,7 +345,7 @@ public class LklMerAuditHandler { LambdaQueryWrapper qWrapper2 = Wrappers.lambdaQuery(); qWrapper2.eq(UserApp::getUserId, baseInfo.getUserId()); UserApp userApp = uaService.getOne(qWrapper2); - sendNotice(userApp, "收银呗审核通知", map.get("remark")+"", merchantChannelStatus.getApplicationId()); + sendNotice(userApp, "银收客审核通知", map.get("remark")+"", merchantChannelStatus.getApplicationId()); } return null; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java index 418a7a7..fa95e90 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java @@ -194,7 +194,7 @@ public class RyxMerAuditHandler { mcs.setExtra(auditResult); mcs.setRemark("通过"); channelStatusService.updateById(mcs); - sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", "商家审核通过", applicationId + "_" + System.currentTimeMillis()); + sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", "商家审核通过", applicationId + "_" + System.currentTimeMillis()); //TODO 统计当前进件商户的上级商户是否满足费率要求 try { @@ -210,7 +210,7 @@ public class RyxMerAuditHandler { mcs.setCallbackStatus("1"); mcs.setRemark(remark); 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); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java index 779cdf0..31dadad 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java @@ -219,7 +219,7 @@ public class SxfMerAuditHandler { String pushMsg = "商家审核通过"; String uniqueKey = auditResult.getString("applicationId") + System.currentTimeMillis(); - sendNotice(userApp, "收银呗审核通知", pushMsg, uniqueKey); + sendNotice(userApp, "银收客审核通知", pushMsg, uniqueKey); mcsMapper.updateById(merchantChannelStatus); //TODO 统计当前进件商户的上级商户是否满足费率要求 @@ -253,7 +253,7 @@ public class SxfMerAuditHandler { merchantChannelStatus.setRemark(auditResult.getString("suggestion")); String uniqueKey = auditResult.getString("applicationId") + "_" + auditResult.getString("timeStamp"); - sendNotice(userApp, "收银呗审核通知", pushMsg, uniqueKey); + sendNotice(userApp, "银收客审核通知", pushMsg, uniqueKey); mcsMapper.updateById(merchantChannelStatus); } @@ -280,7 +280,7 @@ public class SxfMerAuditHandler { String pushMsg = auditResult.getString("suggestion"); merchantChannelStatus.setRemark(pushMsg); String uniqueKey = auditResult.getString("applicationId") + "_" + auditResult.getString("timeStamp"); - sendNotice(userApp, "收银呗审核通知", pushMsg, uniqueKey); + sendNotice(userApp, "银收客审核通知", pushMsg, uniqueKey); mcsMapper.updateById(merchantChannelStatus); } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditV2Handler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditV2Handler.java index bde673e..1c3253e 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditV2Handler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditV2Handler.java @@ -105,7 +105,7 @@ public class YsMerAuditV2Handler extends BaseMerAuditHandler impl merchantOrderMapper.insert(merchantOrder); Map map = new HashMap<>(16); - map.put("body", "收银呗商城充值"); - map.put("subject", "收银呗商城充值"); + map.put("body", "银收客商城充值"); + map.put("subject", "银收客商城充值"); map.put("outTradeNo", orderNumber); map.put("totalAmount", split[0]); @@ -1599,8 +1599,8 @@ public class UserAppServiceImpl extends ServiceImpl impl merchantOrderMapper.insert(merchantOrder); Map map = new HashMap<>(16); - map.put("body", "收银呗商城充值"); - map.put("subject", "收银呗商城充值"); + map.put("body", "银收客商城充值"); + map.put("subject", "银收客商城充值"); map.put("outTradeNo", orderNumber); map.put("totalAmount", targetFee.toPlainString()); @@ -1807,7 +1807,7 @@ public class UserAppServiceImpl extends ServiceImpl impl UserInfo ui = userInfoService.getById(parentApp.getUserId()); if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) { - throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉"); + throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系银收客客服申诉"); } if (!"1".equals(parentApp.getSpreadFlag())) { diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java index c6bbd79..5b05d09 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java @@ -143,7 +143,7 @@ public abstract class BaseUserInfoService extends ServiceImpl aliass = userAppService.storeMemberList(merchantCode); // -// GeneralPushUtil.sendAllPlatByAlias(aliass, "收银呗到账通知", "收银呗到账" + amount + "元", "3"); -// log.debug("===============================收银呗到账" + amount + "元"); +// GeneralPushUtil.sendAllPlatByAlias(aliass, "银收客到账通知", "银收客到账" + amount + "元", "3"); +// log.debug("===============================银收客到账" + amount + "元"); // } // } // } diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/VIPController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/VIPController.java index 5d0d8d4..5020e90 100644 --- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/VIPController.java +++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/VIPController.java @@ -1764,7 +1764,7 @@ public class VIPController { 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("title","白金尊贵会员卡"); baseInfo.put("color","Color010");