Merge branch 'dev' into 'mp-server-test'

查询物流接口切换为地图查询

See merge request quanshu/mp-server!450

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -25,7 +25,6 @@ import com.qs.mp.channel.domain.param.OrderPayParam;
 import com.qs.mp.channel.domain.vo.ChannelCartVO;
 import com.qs.mp.channel.domain.vo.ChannelOrderSettleVO;
 import com.qs.mp.channel.domain.vo.ChannelOrderVO;
-import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.service.IUserAddrService;
 import com.qs.mp.channel.service.IChannelCartService;
 import com.qs.mp.channel.service.IChannelOrderItemService;
@@ -51,8 +50,6 @@ import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import javax.validation.Valid;
 
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -293,7 +290,7 @@ public class ChannelOrderController extends BaseApiController {
     ChannelOrder channelOrder = channelOrderService.getById(param.getOrderId());
     JSONObject jsonObject;
     try {
-      jsonObject = walletService.pay(BizTypeEnum.CHANNEL_ORDER, param.getOrderId(), channelOpenId, channelOrder.getPayAmt());
+      jsonObject = walletService.pay(BizTypeEnum.CHANNEL_ORDER, param.getOrderId(), channelOpenId, channelOrder.getPayAmt(), channelOrder.getTitle());
     }catch (ServiceException e) {
       LogUtil.error(logger, e, "根据经销商采购订单创建支付单失败。userId:{0},orderId:{1}", new Object[]{userId, param.getOrderId()});
       return AjaxResult.error(e.getMessage());

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -1,15 +1,10 @@
 package com.qs.mp.web.controller.api.user;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.mp.admin.domain.param.UserDeliverOrderShipParam;
 import com.qs.mp.channel.domain.ChannelOrder;
-import com.qs.mp.channel.domain.ChannelOrderItem;
 import com.qs.mp.channel.domain.param.OrderPayParam;
-import com.qs.mp.channel.domain.vo.ChannelOrderVO;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.core.redis.RedisCache;
@@ -18,7 +13,6 @@ import com.qs.mp.common.enums.DeliverOrderStatusEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.PrizeStorageStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
-import com.qs.mp.common.service.IDeliveryCompanyService;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.framework.redis.RedisKey;
@@ -230,7 +224,7 @@ public class UserDeliverOrderController extends BaseApiController {
     UserDeliverOrder deliverOrder = userDeliverOrderService.getById(param.getOrderId());
     JSONObject jsonObject;
     try {
-      jsonObject = walletService.pay(BizTypeEnum.DELIVER_ORDER, param.getOrderId(), sysUser.getOpenId(), deliverOrder.getPayAmt());
+      jsonObject = walletService.pay(BizTypeEnum.DELIVER_ORDER, param.getOrderId(), sysUser.getOpenId(), deliverOrder.getPayAmt(), "盲票--提货订单");
     }catch (ServiceException e) {
       LogUtil.error(logger, e, "根据提货单创建支付单失败。userId:{0},orderId:{1}", new Object[]{userId, param.getOrderId()});
       return AjaxResult.error(e.getMessage());

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -1,11 +1,8 @@
 package com.qs.mp.web.controller.api.user;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.mp.admin.domain.CouponTicket;
 import com.qs.mp.admin.domain.Ticket;
 import com.qs.mp.admin.domain.TicketBox;
-import com.qs.mp.admin.service.ICouponTicketService;
 import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.admin.service.ITicketService;
 import com.qs.mp.channel.domain.ChannelOrder;
@@ -13,10 +10,8 @@ import com.qs.mp.channel.domain.param.OrderPayParam;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.redis.RedisCache;
 import com.qs.mp.common.enums.BizTypeEnum;
-import com.qs.mp.common.enums.CouponUseAreaEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.MqTopicType;
-import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.pulsar.PulsarClientService;
 import com.qs.mp.common.utils.LogUtil;
@@ -37,7 +32,6 @@ import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.validation.Valid;
@@ -202,7 +196,7 @@ public class UserTicketOrderController extends BaseApiController {
     UserTicketOrder ticketOrder = userTicketOrderService.getById(param.getOrderId());
     JSONObject jsonObject;
     try {
-      jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), sysUser.getOpenId(), ticketOrder.getPayAmt());
+      jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), sysUser.getOpenId(), ticketOrder.getPayAmt(), ticketOrder.getTitle());
     }catch (ServiceException e) {
       LogUtil.error(logger, e, "根据盲票购买订单创建支付单失败。userId:{0},orderId:{1}", new Object[]{userId, param.getOrderId()});
       return AjaxResult.error(e.getMessage());

mp-admin/src/main/java/com/qs/mp/web/controller/common/LogisticsController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.google.gson.Gson;
 import com.kuaidi100.sdk.api.AutoNum;
 import com.kuaidi100.sdk.api.QueryTrack;
+import com.kuaidi100.sdk.api.QueryTrackMap;
 import com.kuaidi100.sdk.core.IBaseClient;
 import com.kuaidi100.sdk.pojo.HttpResult;
 import com.kuaidi100.sdk.request.AutoNumReq;
@@ -86,6 +87,11 @@ public class LogisticsController extends BaseApiController {
         queryTrackParam.setNum(logisticsQueryParam.getDeliveryFlowId());
         //1：开通行政区域解析功能以及物流轨迹增加物流状态名称
         queryTrackParam.setResultv2("1");
+
+        // 查询地图轨迹必填,暂时写死
+        queryTrackParam.setTo("浙江省杭州市西湖区");
+        queryTrackParam.setFrom("浙江省嘉兴市南湖区");
+
         String param = new Gson().toJson(queryTrackParam);
 
         QueryTrackReq queryTrackReq = new QueryTrackReq();
@@ -94,7 +100,7 @@ public class LogisticsController extends BaseApiController {
         String sign = SignUtils.querySign(param ,key,customer);
         queryTrackReq.setSign(sign);
 
-        IBaseClient baseClient = new QueryTrack();
+        IBaseClient baseClient = new QueryTrackMap();
         try {
             HttpResult execute = baseClient.execute(queryTrackReq);
             String body = execute.getBody();

mp-service/src/main/java/com/qs/mp/pay/service/IWalletService.java

@@ -17,9 +17,11 @@ public interface IWalletService {
    * @param bizId
    * @param openId
    * @param money
+   * @param orderRemark
    * @return
    */
-  JSONObject pay(BizTypeEnum bizType, String bizId, String openId, int money);
+  JSONObject pay(BizTypeEnum bizType, String bizId, String openId, int money,
+      String orderRemark);
 
   /**
    * 用户订单退款

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -1,14 +1,9 @@
 package com.qs.mp.pay.service.impl;
 
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qs.mp.channel.service.IChannelOrderService;
 import com.qs.mp.common.enums.BizTypeEnum;
 import com.qs.mp.common.enums.MqTopicType;
-import com.qs.mp.common.enums.PayOrderStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.pulsar.PulsarClientService;
 import com.qs.mp.common.utils.DateUtils;
@@ -21,15 +16,12 @@ import com.qs.mp.pay.service.IWalletService;
 import com.qs.mp.system.service.id.BizIdGenerator;
 import com.qs.mp.user.service.IUserDeliverOrderService;
 import com.qs.mp.user.service.IUserTicketOrderService;
-import java.util.List;
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @auther duota
@@ -85,7 +77,8 @@ public class WalletServiceImpl implements IWalletService {
   private static final String PAY_RESOURCE_TYPE = "1017"; //2:微信小程序
 
   @Override
-  public JSONObject pay(BizTypeEnum bizType, String bizId, String openId, int money) {
+  public JSONObject pay(BizTypeEnum bizType, String bizId, String openId, int money,
+      String orderRemark) {
     String reqUrl = baseUrl + "/pay/payMoneyCTB";
     String appId = channelAppId;
     String payShopNo = channelPayShopNo;
@@ -95,7 +88,7 @@ public class WalletServiceImpl implements IWalletService {
       payShopNo = userPayShopNo;
       paySign = userPaySign;
     }
-    JSONObject params = buildPayOrderReqData(payShopNo, paySign, money, openId, appId);
+    JSONObject params = buildPayOrderReqData(payShopNo, paySign, money, openId, appId, orderRemark);
     String result = OkHttpUtil.postJsonParams(reqUrl, params.toJSONString());
     logger.info("request params:" + params.toJSONString() + "  result:" + result);
     if (StringUtils.isBlank(result)) {
@@ -229,7 +222,7 @@ public class WalletServiceImpl implements IWalletService {
     return payOrder;
   }
 
-  private JSONObject buildPayOrderReqData(String shopNo, String sign, int money, String openId, String appId) {
+  private JSONObject buildPayOrderReqData(String shopNo, String sign, int money, String openId, String appId, String orderRemark) {
 
     JSONObject sendData = new JSONObject();
     sendData.put("shop_no" , shopNo);
@@ -238,7 +231,7 @@ public class WalletServiceImpl implements IWalletService {
     sendData.put("pay_resource" , PAY_RESOURCE); //支付来源 1:支付宝  2:微信支付 5：云闪付
     sendData.put("trans_type_code" , PAY_RESOURCE_TYPE); //1017：微信小程序
     sendData.put("transaction_amount" , money);
-    sendData.put("order_remark" , "");
+    sendData.put("order_remark" , orderRemark);
     sendData.put("timestamp" , System.currentTimeMillis());
     sendData.put("callback_url" , callbackUrl);