代码优化

order-application-service/src/main/java/cn/freemud/adapter/PointsMallOrderAdapter.java

@@ -3,6 +3,8 @@ package cn.freemud.adapter;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.entities.Active;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
+import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.pay.PayOrderDto;
 import cn.freemud.entities.dto.pay.PayProductDto;
 import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
 import cn.freemud.entities.dto.product.pointsmall.IntegralProductType;
@@ -10,6 +12,7 @@ import cn.freemud.entities.dto.product.pointsmall.PointMallListProductInfoReques
 import cn.freemud.entities.dto.product.pointsmall.ProductStockRequest;
 import cn.freemud.entities.dto.product.pointsmall.UpdatePointsMallStocksRequest;
 import cn.freemud.entities.dto.user.UseScoreRequest;
+import cn.freemud.entities.vo.CreateOrderResponseVo;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
@@ -290,4 +293,20 @@ public class PointsMallOrderAdapter {
         userScoreRequest.setAppId(appId);
         return userScoreRequest;
     }
+
+    public void convent2CreateOrderResponseVo(CreateOrderResponseVo createOrderResponseVo, String appId, FacePayResponseDto response){
+        createOrderResponseVo.setWxappId(appId);
+        createOrderResponseVo.setFmId(response.getFmId());
+        createOrderResponseVo.setPaySuccess(false);
+        String payOrderDto = response.getPayOrder();
+        PayOrderDto payOrder = JSONObject.parseObject(payOrderDto, PayOrderDto.class);
+        if (payOrder != null) {
+            createOrderResponseVo.setTimestamp(payOrder.getTimestamp());
+            createOrderResponseVo.setNonceStr(payOrder.getNonceStr());
+            createOrderResponseVo.setPackageX(payOrder.getPackageX());
+            createOrderResponseVo.setSignType(payOrder.getSignType());
+            createOrderResponseVo.setSign(payOrder.getPaySign());
+            createOrderResponseVo.setOrderStr(payOrder.getAliPayOrder());
+        }
+    }
 }

order-application-service/src/main/java/cn/freemud/entities/dto/user/StatislScoreResponse.java → order-application-service/src/main/java/cn/freemud/entities/dto/user/StatisticalScoreResponse.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 
 @Data
-public class StatislScoreResponse {
+public class StatisticalScoreResponse {
 //    @ApiModelProperty("当前可用积分")
     private Integer currentScore;
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerPropertyClient.java

@@ -19,6 +19,6 @@ public interface CustomerPropertyClient {
 
     @LogIgnoreFeign(logMessage="statisticalScore")
     @PostMapping({"/propertyservice/score/statisticalScore"})
-    CustomerPropertyBaseResponse<StatislScoreResponse> statisticalScore(StatisticalScoreRequestVo request);
+    CustomerPropertyBaseResponse<StatisticalScoreResponse> statisticalScore(StatisticalScoreRequestVo request);
 
 }