Merge remote-tracking branch 'remotes/origin/feature/1.9.9-支付有礼增加sku-海波' into develop

order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGitCheckAndJoinRequestDto.java

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 public class PayGitCheckAndJoinRequestDto {
     //门店编号
@@ -22,4 +24,6 @@ public class PayGitCheckAndJoinRequestDto {
 
     //点餐方式 1-到店取餐 2-外卖
     private Integer orderWay;
+
+    private List<String> skuIds;
 }

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

@@ -820,6 +820,9 @@ public class OrderServiceImpl implements Orderservice {
         payGitRequestDto.setOid(queryOrderResponseVo.getOid());
         payGitRequestDto.setPayAmount(queryOrderResponseVo.getAmount());
         payGitRequestDto.setPayType(1);//1-微信,2-储值卡
+        if(CollectionUtils.isNotEmpty(queryOrderResponseVo.getProducts())){
+            payGitRequestDto.setSkuIds(queryOrderResponseVo.getProducts().stream().map(p -> p.getPid()).collect(Collectors.toList()));
+        }
         if (OrderType.COLLECT_GOODS.getCode().intValue() == queryOrderResponseVo.getOrderType() || OrderType.EAT_IN.getCode().intValue() == queryOrderResponseVo.getOrderType()) {
             payGitRequestDto.setOrderWay(1);
         } else {

platform-sdk/src/main/java/cn/freemud/platform/sdk/hualala/HualalaSdkService.java

@@ -7,6 +7,7 @@ import cn.freemud.platform.sdk.hualala.request.*;
 import cn.freemud.platform.sdk.hualala.response.GetPaySubjectResponse;
 import cn.freemud.platform.sdk.hualala.response.SubmitOrderNewResponse;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -24,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
+
+@Slf4j
 public class HualalaSdkService {
     @Autowired
     private CloudService cloudService;
@@ -52,8 +55,10 @@ public class HualalaSdkService {
         String body = getRequestBodyStr(finalRequest, baseConfig.getMerchantSecret());
         requestHeader.setRequestBody(body);
         requestHeader.setSignature(sign);
-        logger.info("requestBody:{} trackingNo:{}", JSONObject.toJSONString(finalRequest), trackingNo);
+        logger.info("桂源铺推送哗啦啦请求体：{} trackingNo:{}，orderCode：{}，requestHeader：{}",
+                JSONObject.toJSONString(finalRequest), trackingNo, requestBody.getThirdOrderID(), JSONObject.toJSONString(requestHeader));
         SubmitOrderNewResponse submitOrderNewResponse = cloudService.doSend(trackingNo, "https://www-openapi.hualala.com/order/submitordernew", requestHeader, SubmitOrderNewResponse.class);
+        logger.info("桂源铺推送哗啦啦响应体：{} trackingNo:{}，orderCode：{}", JSONObject.toJSONString(submitOrderNewResponse), trackingNo, requestBody.getThirdOrderID());
         return submitOrderNewResponse;
     }
 

push-order-service/src/main/java/cn/freemud/service/SynchronizedOrderHualalaServiceImpl.java

@@ -264,12 +264,7 @@ public class SynchronizedOrderHualalaServiceImpl implements SynchronizedOrderSer
         OrderBody.OrderBean orderBean = orderBody.getOrderBean();
         List<PaymentDetailVo> paymentDetailVos = new ArrayList<>();
         PaymentDetailVo paymentDetailVo = new PaymentDetailVo();
-        /**
-         * 高能预警，此处有坑，以后切到适配层的话，这里需要特殊处理
-         */
-        if (null != orderBean.getOriginalAmount()){
-            paymentDetailVo.setDueAmount(orderBean.getOriginalAmount().toString());
-        }
+        paymentDetailVo.setDueAmount(getPointsConvertToYuan(orderBean.getAmount()) + "");
         /**
          * 参照OrderStatusEnum 会员卡支付需要回写支付状态 15未支付20已支付
          */
@@ -284,6 +279,10 @@ public class SynchronizedOrderHualalaServiceImpl implements SynchronizedOrderSer
         return paymentDetailVos;
     }
 
+    private String getBigDecimalPointsConvertToYuan(BigDecimal point) {
+        return point.divide(new BigDecimal(100)).toString();
+    }
+
     private String getPointsConvertToYuan(Integer point) {
         return new BigDecimal(point == null ? 0 : point).divide(new BigDecimal(100)).toString();
     }