Merge branch 'feature-储值卡增加积分配置ID1039801-zxh-20211124'

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

@@ -200,9 +200,16 @@ public class PayServiceImpl {
         }
         createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, createPrepayRequestDto.getProductOrderBean());
         //更新订单支付信息
-        if (Objects.nonNull(createPrepayRequestDto.getOrderExtInfoDTO()) &&  StringUtils.isNotBlank(cardCode)) {
-            createPrepayRequestDto.getOrderExtInfoDTO().setCardCode(cardCode);
+        if (StringUtils.isNotBlank(cardCode)) {
+            if (Objects.nonNull(createPrepayRequestDto.getOrderExtInfoDTO())) {
+                createPrepayRequestDto.getOrderExtInfoDTO().setCardCode(cardCode);
+            }else {
+                OrderExtInfoDto dto = new OrderExtInfoDto();
+                dto.setCardCode(cardCode);
+                createPrepayRequestDto.setOrderExtInfoDTO(dto);
+            }
         }
+
         BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
         if (baseEditResponse != null) {
             throw new ServiceException(baseEditResponse.getCode(), baseEditResponse.getMessage());