Merge branch 'feature/fix-NPE-bowen'

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

@@ -103,7 +103,10 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
             extendInfoRequest.setIsQueryLabel(0);
             extendInfoRequest.setIsQueryPaid(1);
             BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = customerClient.getMemberExtendInfo(extendInfoRequest);
-            OrderExtInfoDto extInfoDTO = JSONObject.parseObject(confirmOrderRequest.getExtInfo(),OrderExtInfoDto.class);
+            OrderExtInfoDto extInfoDTO = new OrderExtInfoDto();
+            if (StringUtils.isNotBlank(confirmOrderRequest.getExtInfo())){
+                extInfoDTO = JSONObject.parseObject(confirmOrderRequest.getExtInfo(),OrderExtInfoDto.class);
+            }
             if (null == extendInfo.getData()) {
                 extInfoDTO.setMemberLevel("");
                 extInfoDTO.setPaidMember(false);
@@ -126,6 +129,14 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
         return orderSdkAdapter.convent2PayAccessResponse(response);
     }
 
+    public static void main(String[] args) {
+
+        BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = new BaseResponse<>() ;
+        extendInfo.setData(new GetMemberExtendInfoResponseDto());
+        System.out.println(extendInfo.getData().getMemberGrade() != null ? extendInfo.getData().getMemberGrade().getRuleName(): "");
+
+
+    }
     @Override
     public Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest, PaySuccessReq request) {
         // 合阔pos 商户未接单退款超时时间

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

@@ -479,6 +479,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         confirmOrderRequest.setOrderId(orderBean.getOid());
         confirmOrderRequest.setOrderType(orderBean.getType());
         confirmOrderRequest.setProductOrderCode(orderBean.getOid());
+        confirmOrderRequest.setExtInfo(orderBean.getExtInfo());
 
         List<String> orderIds = new ArrayList<>();
         //拼单调促销开团

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

@@ -544,6 +544,7 @@ public class OrderServiceImpl implements Orderservice {
         String pickUpGoodsNo = orderTackCodeManager.generateTackCode(orderBean.getType(),partnerId,storeId,var1,OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc());
         var1.setPickUpGoodsNo(pickUpGoodsNo);
         // 订单支付成功
+        var1.setExtInfo(extInfo);
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderBusinessService.payAccess(var1);
         String string2 = JSONObject.toJSONString(payAccessRes);
         JSONObject jsonObject2 = JSONObject.parseObject(string2);

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

@@ -799,6 +799,7 @@ public class SellCouponOrderServiceImpl {
         var1.setPayTransId(message.getOut_trade_no());
         var1.setOperator(orderBean.getUserName());
         var1.setEndTransId(message.getEndTransId());
+        var1.setExtInfo(orderBean.getExtInfo());
         if(orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0){
             var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         }