Merge branch 'feature/v1.0.14' into qa

call-back-service/src/test/java/cn.freemud/AllTests.java

 package cn.freemud;
 
+import cn.freemud.amp.service.OrderCallBackMQService;
+import cn.freemud.entities.dto.UserLoginInfoDto;
+import cn.freemud.entities.dto.WechatReportOrderDto;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
+import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import org.junit.Test;
 
 import java.io.File;
@@ -16,6 +24,28 @@ import java.util.Set;
 
 public class AllTests {
 
+    /**
+     *  该方法 用于测试 推送微信支付上报获取参数
+     * @param args
+     */
+    public static void main(String[] args) {
+        String str = "{\"abnormalDesc\":\"\",\"abnormalState\":0,\"actualPayAmount\":1.0,\"afterSalesOrderList\":[],\"appId\":\"wxfa229ba41652df7f\",\"barCounter\":\"005\",\"bizType\":1,\"businessDay\":1652371200000,\"canRefund\":true,\"cancelReason\":\"\",\"companySelfCode\":\"\",\"createTime\":1652446892000,\"daySeq\":4,\"deliveryContactInfoList\":[{\"addressDetail\":\"上海市虹口区塘沽路456号\",\"city\":\"\",\"contactsName\":\"\",\"expressNo\":\"0\",\"extInfo\":\"\",\"infoType\":1,\"latitude\":0E-7,\"longitude\":0E-7,\"mobile\":\"13166430721\",\"province\":\"\",\"region\":\"\",\"relateObjectType\":1,\"street\":\"\",\"telephone\":\"\",\"thirdDeliveryId\":\"0\",\"tripDist\":0}],\"deliveryPromise\":0,\"deliveryState\":0,\"dinersNumber\":0,\"dispenseStatus\":1,\"downstreamPosCode\":\"0\",\"downstreamThirdOrderCode\":\"0\",\"evaluationState\":0,\"expressChannelCode\":\"\",\"expressChannelName\":\"\",\"expressNo\":\"\",\"expressType\":0,\"extInfo\":\"{\\\"appid\\\":\\\"wxfa229ba41652df7f\\\",\\\"deliveryHoursDayStart\\\":\\\"\\\",\\\"endTransId\\\":\\\"20220513100000210002111094704150\\\",\\\"fmId\\\":\\\"8802865243694612136531288\\\",\\\"openid\\\":\\\"oHZsJ5d-gbBvUNBoVrhZCV1rWcJE\\\",\\\"paidMember\\\":false,\\\"payDate\\\":\\\"2022-05-13 21:01:39\\\",\\\"payTransId\\\":\\\"8802865243694612136531288\\\",\\\"prepayId\\\":\\\"wx132101331091569eff3057deaf2fb50000\\\",\\\"serviceTime\\\":30,\\\"sessionKey\\\":\\\"rsGu1d6PwtARrxIYzkHxxg==\\\"}\",\"immediately\":true,\"isParent\":false,\"localTableKey\":\"\",\"marketingCode\":\"\",\"marketingType\":0,\"needInvoice\":false,\"note\":\"\",\"operator\":\"\",\"orderArea\":\"0\",\"orderClient\":2,\"orderCode\":\"24369461192889072600004\",\"orderCostDetailList\":[],\"orderExtended\":{\"createTime\":1652446892000,\"id\":243694611928890726,\"isDeleted\":false,\"orderClientGroup\":\"\",\"orderClientGroupCode\":\"\",\"orderCode\":\"24369461192889072600004\",\"orderId\":243694611928890726,\"partnerId\":\"2865\",\"sendWord\":\"\",\"spellGroupCode\":\"\",\"storeId\":\"8630021001941262-8630021001941262\",\"storeNameEn\":\"\",\"updateTime\":1652446892000,\"userPhone\":\"\",\"version\":0},\"orderInvoice\":{\"address\":\"\",\"bankCardNo\":\"\",\"content\":\"\",\"invoiceBank\":\"\",\"invoiceNo\":\"\",\"invoiceUrl\":\"\",\"itemId\":\"\",\"partnerId\":\"\",\"phoneNo\":\"\",\"pickUpNo\":\"\",\"taxNo\":\"\",\"title\":\"\",\"userId\":\"\"},\"orderItemList\":[{\"canRefund\":true,\"categoryId\":\"0\",\"categoryName\":\"0\",\"extInfo\":\"{\\\"score\\\": 0, \\\"linkedId\\\": \\\"\\\", \\\"showPrice\\\": 1, \\\"isSendGoods\\\": false, \\\"cartGoodsUid\\\": \\\"8c31801197f747e4ae9780c8d248e965\\\"}\",\"id\":243694611948813672,\"ignoreInOrderClose\":false,\"marketingCode\":\"0\",\"marketingType\":0,\"nickName\":\"\",\"note\":\"\",\"openId\":\"\",\"originalProductType\":0,\"parentProductId\":\"0\",\"photoUrl\":\"\",\"productCode\":\"20220424001\",\"productForeignName\":\"\",\"productForeignProperty\":\"\",\"productForeignSpecName\":\"\",\"productId\":\"239055192095472910\",\"productName\":\"可乐\",\"productPicUrl\":\"https://picture.sandload.cn/1650780459062.jpg\",\"productPrice\":1.0,\"productProperty\":\"\",\"productQuantity\":1,\"productSeq\":0,\"productSharePrice\":0.0,\"productSpec\":\"239055192095472910\",\"productSpecName\":\"可乐\",\"productType\":1,\"productUnit\":\"\",\"productUpc\":\"\",\"productWeightUnit\":0,\"salePrice\":1.0,\"settlementPrice\":1.0,\"thirdProductId\":\"20220424001\",\"userId\":\"\",\"weight\":0.00}],\"orderSendCouponRespList\":[],\"orderSettlementDetailList\":[{\"agentDiscountAmount\":0.0,\"carrierDiscountAmount\":0.0,\"extInfo\":\"\",\"externalObjectId\":\"\",\"externalObjectName\":\"优惠总金额\",\"externalObjectSubId\":\"\",\"ignoreInDiscountAmount\":false,\"isOnline\":true,\"note\":\"\",\"number\":0,\"platformDiscountAmount\":0.0,\"platformServiceAmount\":0.0,\"productId\":\"0\",\"productSeq\":0,\"prospectiveAmount\":0.0,\"settlementAmount\":1.0,\"settlementType\":205,\"shopAmount\":0.0,\"shopDiscountAmount\":0.0}],\"orderState\":1,\"orderSubState\":0,\"orderType\":1,\"originalAmount\":1.0,\"parentCode\":\"0\",\"partnerId\":\"2865\",\"partnerName\":\"\",\"payChannel\":\"10211\",\"payChannelName\":\"微信\",\"payChannelType\":1,\"payRequestNo\":\"8802865243694612136531288\",\"payState\":2,\"payTime\":1652446899684,\"payType\":1,\"pickUpGoodsNo\":\"5055\",\"posCode\":\"\",\"posTableKey\":\"\",\"printNum\":0,\"settlementAmount\":1.0,\"sourceType\":0,\"storeId\":\"8630021001941262-8630021001941262\",\"storeName\":\"沙县小吃\",\"storeUnifyId\":\"0\",\"suspendDesc\":\"\",\"suspendState\":0,\"thirdOrderCode\":\"24369461192889072600004\",\"thirdStoreId\":\"\",\"toStoreId\":\"0\",\"updateTime\":1652446892000,\"userId\":\"3647332017865482101\",\"userName\":\"\",\"weight\":0.00}";
+        OrderCallBackRequestVo body = new OrderCallBackRequestVo();
+        body.setContent(str);
+        body.setOperateType(0);
+        body.setMsgType("1");
+        OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
+        OrderCallBackMQService orderCallBackMQService = new OrderCallBackMQService();
+        OrderExtInfoDto orderExtInfoDto = JSONObject.parseObject(orderInfoReqs.getExtInfo(), OrderExtInfoDto.class);
+        orderExtInfoDto.setPlatformMchId("null");
+        UserLoginInfoDto userLoginInfoDto = new UserLoginInfoDto();
+        userLoginInfoDto.setWxAppid(orderInfoReqs.getAppId());
+        userLoginInfoDto.setOpenId(orderExtInfoDto.getOpenid());
+        userLoginInfoDto.setSessionKey(orderExtInfoDto.getSessionId());
+//        WechatReportOrderDto wechatReportOrderDto = orderCallBackMQService.getWechatReportOrderDto(orderInfoReqs, orderExtInfoDto, userLoginInfoDto);
+//        System.out.println(JSON.toJSONString(wechatReportOrderDto));
+    }
+
     @Test
     public void entityTest() throws Exception {
         int i = 0;

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2087,16 +2087,23 @@ public class OrderServiceImpl implements Orderservice {
                 //获取支付返回退款状态
                 state = PayRefundStatus.SUCCESS.getCode();
             } else {
-                //调用支付退款
-                PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
-                //抖音支付退款必传
-                orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款" : orderRefundVo.getReason());
-                response = payServiceImpl.orderRefund(orderPayRefundRequest);
-                if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
-                    return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
+                OrderExtendedReq ext = orderBean.getOrderExtended();
+                if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
+                    //代付人信息不为空  并且和订单创建人不一样，表示代付单
+                    PayRefundResponse resp = paymentHandle.agentPayRefund(orderBean);
+                    state = resp.getPayRefundStatus().getCode();
+                } else {
+                    //调用支付退款
+                    PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+                    //抖音支付退款必传
+                    orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款" : orderRefundVo.getReason());
+                    response = payServiceImpl.orderRefund(orderPayRefundRequest);
+                    if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
+                        return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
+                    }
+                    //获取支付返回退款状态
+                    state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
                 }
-                //获取支付返回退款状态
-                state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
             }
         }
 

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -122,11 +122,10 @@ public class PaymentHandle {
     /**
      * 代付订单退款
      *
-     * @param request
      * @param orderBean
      * @return
      */
-    public PayRefundResponse agentPayRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
+    public PayRefundResponse agentPayRefund(OrderBeanV1 orderBean) {
         PayRefundResponse ret = new PayRefundResponse();
         try {
             OrderExtInfoDto ext = JSON.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -247,7 +247,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
                 OrderExtendedReq ext = orderBean.getOrderExtended();
                 if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
                     //代付人信息不为空  并且和订单创建人不一样，表示代付单
-                    refundResponse = paymentHandle.agentPayRefund(request, orderBean);
+                    refundResponse = paymentHandle.agentPayRefund(orderBean);
                 } else {
                     //正常订单现金退款
                     refundResponse = paymentHandle.refund(request, orderBean);