caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

追踪物流信息增加手机号后四位参数

Browse Source
This commit is contained in:
caihongcheng 2022-05-06 16:16:34 +08:00
parent 0ff6809d63
commit 4705c2595a
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
View File

@ -269,8 +269,8 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
//根据售后单号获取售后单
AfterSale afterSale = OperationalJudgment.judgment(this.getBySn(afterSaleSn));
return logisticsService.getLogistic(afterSale.getMLogisticsCode(), afterSale.getMLogisticsNo());
String str=storeDetailService.getStoreDetail(afterSale.getStoreId()).getSalesConsigneeMobile();
return logisticsService.getLogistic(afterSale.getMLogisticsCode(), afterSale.getMLogisticsNo(), str.substring(str.length()-4));
}
@Override

3
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@ -445,7 +445,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
//获取订单信息
Order order = this.getBySn(orderSn);
//获取踪迹信息
return logisticsService.getLogistic(order.getLogisticsCode(), order.getLogisticsNo());
String str=order.getConsigneeMobile();
return logisticsService.getLogistic(order.getLogisticsCode(), order.getLogisticsNo(), str.substring(str.length()-4));
}
@Override

2
framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
View File

@ -293,7 +293,7 @@ public class WechatPlugin implements Payment {
Map<String, String> map = WxPayKit.appPrepayIdCreateSign(appid,
setting.getMchId(),
prepayId,
setting.getApiclient_key(), SignType.HMACSHA256);
setting.getApiclient_key(), SignType.MD5);
log.info("唤起支付参数:{}", map);
return ResultUtil.data(map);

3
framework/src/main/java/cn/lili/modules/system/service/LogisticsService.java
View File

@ -19,9 +19,10 @@ public interface LogisticsService extends IService<Logistics> {
*
* @param logisticsId 物流公司ID
* @param logisticsNo 单号
* @param customerName 手机号后四位
* @return
*/
Traces getLogistic(String logisticsId, String logisticsNo);
Traces getLogistic(String logisticsId, String logisticsNo, String customerName);
/**
* 获取已开启的物流公司列表

12
framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java
View File

@ -43,9 +43,9 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics
private SettingService settingService;
@Override
public Traces getLogistic(String logisticsId, String logisticsNo) {
public Traces getLogistic(String logisticsId, String logisticsNo, String customerName) {
try {
return getOrderTracesByJson(logisticsId, logisticsNo);
return getOrderTracesByJson(logisticsId, logisticsNo,customerName);
} catch (Exception e) {
log.error("获取物流公司错误",e);
@ -65,10 +65,11 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics
*
* @param logisticsId 物流公司ID
* @param expNo 物流单号
* @param customerName 手机号后四位
* @return 物流信息
* @throws Exception
*/
private Traces getOrderTracesByJson(String logisticsId, String expNo) throws Exception {
private Traces getOrderTracesByJson(String logisticsId, String expNo, String customerName) throws Exception {
Setting setting = settingService.get(SettingEnum.KUAIDI_SETTING.name());
if (CharSequenceUtil.isBlank(setting.getSettingValue())) {
throw new ServiceException(ResultCode.LOGISTICS_NOT_SETTING);
@ -87,7 +88,10 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics
Logistics logistics = this.getById(logisticsId);
if (logistics != null) {
String requestData = "{'OrderCode':'','ShipperCode':'" + logistics.getCode() + "','LogisticCode':'" + expNo + "'}";
String requestData = "{'OrderCode':'','ShipperCode':'" + logistics.getCode() +
"','LogisticCode':'" + expNo + "'" +
"','CustomerName':'" + customerName + "'"+
"}";
Map<String, String> params = new HashMap<>(8);
params.put("RequestData", urlEncoder(requestData, "UTF-8"));
params.put("EBusinessID", EBusinessID);