修改字段名,暂存

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -222,7 +222,7 @@ public class CreateOrderVo {
 
         @NotNull(message = "银联礼品卡手机号必传")
         @ApiModelProperty(value = "银联礼品卡手机号",required = true)
-        private String phoneNumber;
+        private String code;
 
         @NotNull(message = "银联礼品卡密码必传")
         @ApiModelProperty(value = "银联礼品卡密码",required = true)

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

@@ -1862,7 +1862,7 @@ public class OrderServiceImpl implements Orderservice {
      */
     private OrderPayResponse upcPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderVo.UnionPayCard unionPayCard) {
         OrderPayResponse orderPayResponse = new OrderPayResponse();
-        if (Objects.isNull(unionPayCard) || StringUtils.isBlank(unionPayCard.getPhoneNumber()) || StringUtils.isBlank(unionPayCard.getPassword())) {
+        if (Objects.isNull(unionPayCard) || StringUtils.isBlank(unionPayCard.getCode()) || StringUtils.isBlank(unionPayCard.getPassword())) {
             orderPayResponse.setMsg("银联礼品卡信息缺失");
             return orderPayResponse;
         }
@@ -1870,8 +1870,7 @@ public class OrderServiceImpl implements Orderservice {
         String partnerId = orderBean.getCompanyId();
         request.setBody(orderBean.getShopName());
         request.setBusinessDate(DateTimeFormatter.ofPattern(DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).format(LocalDateTime.now()));
-//        request.setCode(unionPayCard.getPhoneNumber());
-        request.setCode(paymentRequest.getOpenId());
+        request.setCode(unionPayCard.getCode());
         request.setPartnerId(partnerId);
         request.setStoreId(orderBean.getShopId());
         request.setAmount(orderBean.getAmount());