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

设备商城金额换成真实，配置文件更改，配置微信模板消息，快递鸟相关

Browse Source
This commit is contained in:
liuyingfang
2023-06-03 09:22:51 +08:00
parent 6f6938daa4
commit 3c6085805f
14 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/AgentStaffMainPageServiceImpl.java
View File

@@ -61,7 +61,7 @@ public class AgentStaffMainPageServiceImpl implements MainPageService {
Double promoteConsumeFee;
Integer totalOrderCount;
//分润
//快银收银
Map<String, Object> queryMap = new HashMap<>();
queryMap.put("userId", queryUserApp.getParentId());
queryMap.put("agentStaffId", userId);

2
pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressService.java
View File

@@ -10,5 +10,5 @@ public interface MercOrderExpressService extends IService<MercOrderExpress> {
MercOrderExpress getByExpressNo(String expressNo);
JSONObject getExpressInfo(String expressNo) throws Exception;
JSONObject getExpressInfo(String orderNo) throws Exception;
}

25
pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressServiceImpl.java
View File

@@ -1,27 +1,34 @@
package cn.pluss.platform.device.impl;
import cn.pluss.platform.device.MercOrderDetailService;
import cn.pluss.platform.device.MercOrderExpressService;
import cn.pluss.platform.entity.MercOrderDetail;
import cn.pluss.platform.entity.MercOrderExpress;
import cn.pluss.platform.enums.LogisticProvider;
import cn.pluss.platform.exception.MsgException;
import cn.pluss.platform.mapper.MercOrderExpressMapper;
import cn.pluss.platform.util.*;
import cn.pluss.platform.vo.MercOrderExpressVO;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
public class MercOrderExpressServiceImpl extends ServiceImpl<MercOrderExpressMapper, MercOrderExpress> implements MercOrderExpressService {
public static final String CHECK_Express = "https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx";
@Resource
private MercOrderDetailService mercOrderDetailService;
/**
* 根据上送物流单号查询商户单号
* @param logistNo
@@ -38,23 +45,27 @@ public class MercOrderExpressServiceImpl extends ServiceImpl<MercOrderExpressMap
}
@Override
public JSONObject getExpressInfo(String expressNo) throws Exception {
if (expressNo.isEmpty()){
public JSONObject getExpressInfo(String orderNo) throws Exception {
List<MercOrderDetail> detailByOrderNo = mercOrderDetailService.getDetailByOrderNo(orderNo, "01");
if (detailByOrderNo == null || detailByOrderNo.get(0).getExpressNo() == null){
throw new MsgException("暂无相应的快递单号");
}
JSONObject reqData = new JSONObject();
String subThree = expressNo.substring(0, 3);
String subThree = detailByOrderNo.get(0).getExpressNo();
if ("268".equals(subThree) || "368".equals(subThree) || "468".equals(subThree)|| "334".equals(subThree)
|| "888".equals(subThree) || "77".equals(expressNo.substring(0,2))){
|| "888".equals(subThree) || "77".equals(detailByOrderNo.get(0).getExpressNo().substring(0,2))){
reqData.put("ShipperCode", LogisticProvider.STO.getCode());
} else if ("YT".equals(expressNo.substring(0,2))){
} else if ("YT".equals(detailByOrderNo.get(0).getExpressNo().substring(0,2))){
reqData.put("ShipperCode", LogisticProvider.YTO.getCode());
} else if ("55".equals(expressNo.substring(0,2))){
} else if ("55".equals(detailByOrderNo.get(0).getExpressNo().substring(0,2))){
reqData.put("ShipperCode", LogisticProvider.HTKY.getCode());
}else {
return new JSONObject();
}
reqData.put("LogisticCode", expressNo);
reqData.put("LogisticCode", detailByOrderNo.get(0).getExpressNo());
JSONObject jsonObject = reqJsonData(reqData);
if (!(Boolean) jsonObject.get("Success")){

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

@@ -383,7 +383,7 @@ public class MerchantMenberServiceImpl extends ServiceImpl<MerchantMenberMapper,
String[] array = {menber.getMemberCode(),amt.toString(), DateUtils.toString(new Date(),"yyyy-MM-dd HH:mm:ss"),transTitle, useFee};
WxAccessTokenRequest request = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID, ParametersUtil.APPSECRET, null, WxConstants.ACCESS_TOKEN_URL);
//TODO miniprogram后续小程序调整好后再接
WxTemolateRequest temolateRequest = new WxTemolateRequest(menber.getOpenid(),WxConstants.VIP_BALANCE_CHANGE_TEMPLATE_ID,null,null)
WxTemolateRequest temolateRequest = new WxTemolateRequest(menber.getOpenid(),WxConstants.VIP_BALANCE_CHANGE_TEMPLATE_ID,null,miniprogram)
.buildData(first,remark,array);
wxCommonService.sendTemplateMsg(temolateRequest,request);
}

4
pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java
View File

@@ -705,8 +705,8 @@ public class ApiPayServiceImpl implements ApiPayService {
order.setAlias(merchant.getMerchantName());
try {
//TODO测试金额上线会删除
order.setConsumeFee(0.01);
// TODO 测试金额上线会删除
order.setConsumeFee(mercOrderNew.getActualAmt().doubleValue());
JSONObject result = sxfPayService.tradePay(order, channel,merchant);

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

@@ -91,7 +91,7 @@ public class YsChangeRateServiceImpl extends BaseMchChannelRateNewService {
rateNewRecordService.save(mrnr);
// 上传一张空白图作为结算信息修改申请表
((YsAuditServiceImpl) ysAuditServiceV2).imageUploadEdit("https://www.shouyinbei.net/resources/images/upload/blank.png", "B008", changeFlowId);
((YsAuditServiceImpl) ysAuditServiceV2).imageUploadEdit("https://www.shouyinbei.net/resources快银收银s/upload/blank.png", "B008", changeFlowId);
}
@Override