Skip to content

O
order-group
Commit ae86142d by ping.wu
Options

CreateOrder内部类去除

parent c1a0cb06
Showing with 247 additions and 223 deletions
order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java
......@@ -19,6 +19,7 @@ import cn.freemud.entities.vo.CreateOrderBaseVo;
import cn.freemud.entities.vo.CreateOrderResponseVo;
import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.GetProductsVo;
import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import com.alibaba.fastjson.JSONArray;
......@@ -96,7 +97,7 @@ public class CreateOrderAdapter {
// 转换 fisherman begin
CreateOrderBaseVo.UnionPayCard unionPayCard = createOrderBo.getCreateOrderBaseVo().getUnionPayCard();
if (unionPayCard != null) {
CreateOrderVo.UnionPayCard u = new CreateOrderVo.UnionPayCard();
CreateOrderUnionPayCardVo u = new CreateOrderUnionPayCardVo();
u.setCode(unionPayCard.getCode());
u.setPassword(unionPayCard.getPassword());
requestDto.setUnionPayCard(u);
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -30,6 +30,7 @@ import cn.freemud.entities.ttpay.OrderInfo;
import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
import cn.freemud.entities.vo.encircle.PreviewOrderInfoVo;
import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.enums.OrderChannelType;
import cn.freemud.enums.OrderSourceType;
......@@ -530,7 +531,7 @@ public class OrderAdapter {
UserDeliveryInfoDto userDeliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
String deliveryType = userDeliveryInfoDto != null && userDeliveryInfoDto.getStoreDeliveryInfoDto() != null
? userDeliveryInfoDto.getStoreDeliveryInfoDto().getDeliveryType() : "";
createOrderVo.setUserDeliveryInfoDto(userDeliveryInfoDto);
// createOrderVo.setUserDeliveryInfoDto(userDeliveryInfoDto);
Integer orderType;
String receiveAddress = createOrderVo.getStoreAddress();
// fisherman -> 爱马哥 orderType落库的类型处理
......@@ -3263,7 +3264,7 @@ public class OrderAdapter {
public CreatePrepayRequestDto convertToCreatePrepayRequestDto(String partnerId, String wxAppId, String openId,
String faceCode, String cardCode, String payCode, OrderBeanV1 fatherOrderBean,
OrderBeanV1 productOrderBean, long totalAmount, int cardAmount, OrderExtInfoDto orderExtInfoDTO,
String transId, OrderClientType orderClient, CreateOrderVo.UnionPayCard unionPayCard) {
String transId, OrderClientType orderClient, CreateOrderUnionPayCardVo unionPayCard) {
CreatePrepayRequestDto requestDto = new CreatePrepayRequestDto();
requestDto.setPartnerId(partnerId);
requestDto.setWxAppId(wxAppId);
......
order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.java
package cn.freemud.entities.dto.order;
import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
......@@ -66,7 +67,7 @@ public class CreatePrepayRequestDto {
/**
* 使用电子风味卡
*/
private CreateOrderVo.UnionPayCard unionPayCard;
private CreateOrderUnionPayCardVo unionPayCard;
private String storeId;
private String channel;
......
order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/GetShoppingCartGoodsApportionDto.java
package cn.freemud.entities.dto.shoppingCart;
import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
import cn.freemud.entities.vo.order.CreateOrderPremiumExchangeActivityVo;
import lombok.Data;
@Data
......@@ -9,6 +9,6 @@ public class GetShoppingCartGoodsApportionDto {
private ShoppingCartInfoRequestVo shoppingCartInfoRequestVo;
private CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity;
private CreateOrderPremiumExchangeActivityVo premiumExchangeActivity;
}
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderBaseVo.java
......@@ -2,6 +2,7 @@ package cn.freemud.entities.vo;
import cn.freemud.entities.dto.UserDeliveryInfoDto;
import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
import cn.freemud.entities.vo.order.CreateOrderPremiumExchangeActivityVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
......@@ -177,7 +178,7 @@ public class CreateOrderBaseVo {
// 这里冗余了 CreateOrderVo 对象的属性, 后期需要优化 fisherman
@Valid
private CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity;
private CreateOrderPremiumExchangeActivityVo premiumExchangeActivity;
/**
* 买一赠一选择的商品
......@@ -194,7 +195,7 @@ public class CreateOrderBaseVo {
/**
* 会员卡信息
*/
private BuyMemberCard buyMemberCard;
// private BuyMemberCard buyMemberCard;
/**
* svc 卡支付使用
......
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
......@@ -14,9 +14,8 @@ package cn.freemud.entities.vo;
import cn.freemud.entities.dto.UserDeliveryInfoDto;
import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
import cn.freemud.entities.vo.order.CreateOrderProductVo;
import cn.freemud.entities.vo.order.*;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
......@@ -136,7 +135,7 @@ public class CreateOrderVo {
/**
* 是否外带 ,打包 1 是 0 否
*/
private Integer takeOut;
// private Integer takeOut;
/**
* 订单备注
*/
......@@ -179,7 +178,7 @@ public class CreateOrderVo {
/**
* 券码列表
*/
private List<couponCode> couponCodes;
private List<CreateOrderCouponCodeVo> couponCodes;
/**
* 运费券code
......@@ -201,12 +200,13 @@ public class CreateOrderVo {
private Byte payChannelType;
@Valid
private PremiumExchangeActivity premiumExchangeActivity;
private CreateOrderPremiumExchangeActivityVo premiumExchangeActivity;
/**
* coco 买一赠一寄杯
* 买一赠一选择的商品
*/
private List<ChooseGood> chooseGoods;
private List<CreateOrderChooseGoodVo> chooseGoods;
/**
* 是否使用用户积分
......@@ -251,26 +251,30 @@ public class CreateOrderVo {
private String channelType;
/**
* 麦咖啡请求参数
* 是否需要餐具，1 需要 0不需要
*/
private Integer needTableware;
/**
* 麦咖啡请求参数
* 是否需要开发票，1 需要 0不需要
*/
private Integer needInvoice;
/**
* 麦咖啡请求参数
* 发票抬头
*/
private String invoiceTitle;
/**
* 随单购是否购买月享卡
* 1:不购买，2：月卡续费，3：新购月卡
* 麦咖啡请求参数
* 随单购是否购买月享卡 1:不购买，2：月卡续费，3：新购月卡
*/
private String buyMonthlyCard;
// 麦咖啡请求参数
private String monthlyCardCode;
/**
......@@ -294,192 +298,20 @@ public class CreateOrderVo {
*/
@Valid
@ApiModelProperty(value = "电子风味卡")
private UnionPayCard unionPayCard;
private CreateOrderUnionPayCardVo unionPayCard;
/**
* 下单商品，积分商城使用
*/
private List<CreateOrderProductVo> products;
/**
* 电子风味卡
*/
@Data
@ApiModel(value = "电子风味卡", description = "如果传了电子风味卡字段,此类中属性必传")
public static class UnionPayCard {
@NotNull(message = "电子风味卡手机号必传")
@ApiModelProperty(value = "电子风味卡卡号(手机号)",required = true)
private String code;
@NotNull(message = "电子风味卡密码必传")
@ApiModelProperty(value = "电子风味卡密码",required = true)
private String password;
}
/**
* 微信配送地址信息
*/
private WeixinDeliveryAddressDto weixinDeliveryAddress;
@Data
public static class PremiumExchangeActivity {
@NotNull(message = "activityCode 不能为空")
private String activityCode;
@NotNull(message = "activityName 不能为空")
private String activityName;
/**
* 加价购sku商品信息
*/
@Valid
private List<Product> products;
@Data
public static class Product {
/**
* spuId 商品原始id
*/
@NotNull(message = "spuId不能为空")
private String spuId;
/**
* skuId 如果是多规格 skuId 不能为空
*/
@NotNull(message = "skuId不能为空")
private String skuId;
/**
* 商品名称
*/
@NotNull(message = "商品名称不能为空")
private String skuName;
private String skuForeignName;
@NotNull(message = "商品数量不能为空")
private Integer qty;
/**
* 图片
*/
private String picture;
/**
* 加价购 可能会涉及 虚拟商品 类型 = 9
*/
private Integer productType;
/**
* 原价 入参不需要传，做对象组装使用
*/
private Long originalPrice;
/**
* 现价 入参不需要传，做对象组装使用
*/
private Long nowPrice;
@Valid
private List<Attribute> attributes;
@Data
public static class Attribute {
/**
* 属性ID
*/
private String attributeId;
/**
* 属性名称
*/
private String attributeValue;
private String attributeForeignValue;
}
}
}
@Data
public final static class BuyMemberCard {
/**
* 付费会员卡ID
*/
private String paidId;
/**
* 规则ID
*/
private String ruleId;
}
@Data
public static class ChooseGood {
/**
* 活动类型
*/
private Integer activeType;
/**
* 活动号
*/
private String activeCode;
/**
* 赠送商品id
*/
private String goodsId;
/**
* 赠送商品名称
*/
private String goodsName;
private String goodsForeignName;
/**
* 赠送商品数量
*/
private Integer qty;
/**
* 可兑换商品券编号
*/
private String couponCode ;
/**
* 商品券兑换数量
*/
private Integer couponQty;
/**
* 是否已选择寄杯
*/
private Boolean sendCoupon;
}
@Data
public final static class couponCode {
/**
* 优惠券
*/
private String couponCode;
/**
* 活动号
*/
private String activityCode;
/**
* 顺序
*/
private Integer index;
/**
* 优惠券类型
*/
private Integer couponType;
}
/**
* 微商城立即购买场景新增
* 购买类型 0=普通购买 1=立即购买 ，默认值为普通购买
*/
private int buyType = 0;
......
order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
......@@ -106,7 +106,7 @@ public class ShoppingCartInfoRequestVo {
/**
* 会员卡信息
*/
private BuyMemberCard buyMemberCard;
// private BuyMemberCard buyMemberCard;
private String menuType;
/**
......@@ -117,11 +117,13 @@ public class ShoppingCartInfoRequestVo {
private String receiveId;
/**
* 麦咖啡请求参数
* 随单购是否购买月享卡
* 1:不购买，2：月卡续费，3：新购月卡
*/
private String buyMonthlyCard;
//麦咖啡请求参数
private String monthlyCardCode;
/**
* 是否为订单请求算价来源
......@@ -144,17 +146,17 @@ public class ShoppingCartInfoRequestVo {
private Integer qty;
}
@Data
public final static class BuyMemberCard {
/**
* 付费会员卡ID
*/
private String paidId;
/**
* 规则ID
*/
private String ruleId;
}
// @Data
// public final static class BuyMemberCard {
// /**
// * 付费会员卡ID
// */
// private String paidId;
// /**
// * 规则ID
// */
// private String ruleId;
// }
/**
* 买一赠一寄件商品
......@@ -223,7 +225,7 @@ public class ShoppingCartInfoRequestVo {
}
/**
* 购买类型 1=普通购买 1=立即购买 ，默认值为普通购买
* 购买类型 0=普通购买 1=立即购买 ，默认值为普通购买
*/
private int buyType = 0;
......
order-application-service/src/main/java/cn/freemud/entities/vo/order/CreateOrderChooseGoodVo.java 0 → 100644
package cn.freemud.entities.vo.order;
import lombok.Data;
@Data
public class CreateOrderChooseGoodVo {
/**
* 活动类型
*/
private Integer activeType;
/**
* 活动号
*/
private String activeCode;
/**
* 赠送商品id
*/
private String goodsId;
/**
* 赠送商品名称
*/
private String goodsName;
private String goodsForeignName;
/**
* 赠送商品数量
*/
private Integer qty;
/**
* 可兑换商品券编号
*/
private String couponCode ;
/**
* 商品券兑换数量
*/
private Integer couponQty;
/**
* 是否已选择寄杯
*/
private Boolean sendCoupon;
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/CreateOrderCouponCodeVo.java 0 → 100644
package cn.freemud.entities.vo.order;
import lombok.Data;
@Data
public class CreateOrderCouponCodeVo {
/**
* 优惠券
*/
private String couponCode;
/**
* 活动号
*/
private String activityCode;
/**
* 顺序
*/
private Integer index;
/**
* 优惠券类型
*/
private Integer couponType;
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/CreateOrderPremiumExchangeActivityVo.java 0 → 100644
package cn.freemud.entities.vo.order;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
public class CreateOrderPremiumExchangeActivityVo {
@NotNull(message = "activityCode 不能为空")
private String activityCode;
@NotNull(message = "activityName 不能为空")
private String activityName;
/**
* 加价购sku商品信息
*/
@Valid
private List<Product> products;
@Data
public static class Product {
/**
* spuId 商品原始id
*/
@NotNull(message = "spuId不能为空")
private String spuId;
/**
* skuId 如果是多规格 skuId 不能为空
*/
@NotNull(message = "skuId不能为空")
private String skuId;
/**
* 商品名称
*/
@NotNull(message = "商品名称不能为空")
private String skuName;
private String skuForeignName;
@NotNull(message = "商品数量不能为空")
private Integer qty;
/**
* 图片
*/
private String picture;
/**
* 加价购 可能会涉及 虚拟商品 类型 = 9
*/
private Integer productType;
/**
* 原价 入参不需要传，做对象组装使用
*/
private Long originalPrice;
/**
* 现价 入参不需要传，做对象组装使用
*/
private Long nowPrice;
@Valid
private List<Attribute> attributes;
@Data
public static class Attribute {
/**
* 属性ID
*/
private String attributeId;
/**
* 属性名称
*/
private String attributeValue;
private String attributeForeignValue;
}
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/CreateOrderUnionPayCardVo.java 0 → 100644
package cn.freemud.entities.vo.order;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
@ApiModel(value = "电子风味卡", description = "如果传了电子风味卡字段,此类中属性必传")
public class CreateOrderUnionPayCardVo {
@NotNull(message = "电子风味卡手机号必传")
@ApiModelProperty(value = "电子风味卡卡号(手机号)",required = true)
private String code;
@NotNull(message = "电子风味卡密码必传")
@ApiModelProperty(value = "电子风味卡密码",required = true)
private String password;
}
order-application-service/src/main/java/cn/freemud/service/CheckOrderUniversal.java
......@@ -268,13 +268,13 @@ public abstract class CheckOrderUniversal {
protected abstract OrderChannelType getChannelType();
private ShoppingCartInfoRequestVo initShoppingCartInfoRequestVoBuilder(CreateOrderBaseVo createOrderVo) {
ShoppingCartInfoRequestVo.BuyMemberCard buyMemberCard = null;
// ShoppingCartInfoRequestVo.BuyMemberCard buyMemberCard = null;
// 商城订单 没有会员卡
if (createOrderVo.getBuyMemberCard() != null && checkCardCode()) {
buyMemberCard = new ShoppingCartInfoRequestVo.BuyMemberCard();
buyMemberCard.setPaidId(createOrderVo.getBuyMemberCard().getPaidId());
buyMemberCard.setRuleId(createOrderVo.getBuyMemberCard().getRuleId());
}
// if (createOrderVo.getBuyMemberCard() != null && checkCardCode()) {
// buyMemberCard = new ShoppingCartInfoRequestVo.BuyMemberCard();
// buyMemberCard.setPaidId(createOrderVo.getBuyMemberCard().getPaidId());
// buyMemberCard.setRuleId(createOrderVo.getBuyMemberCard().getRuleId());
// }
return ShoppingCartInfoRequestVo.builder()
.partnerId(createOrderVo.getPartnerId())
.shopId(createOrderVo.getShopId())
......@@ -286,7 +286,7 @@ public abstract class CheckOrderUniversal {
.receiveId(createOrderVo.getReceiveId())
.useCustomerScore(createOrderVo.getUseCustomerScore())
.channelType(getChannelType().getCode())
.buyMemberCard(buyMemberCard)
// .buyMemberCard(buyMemberCard)
.menuType(createOrderVo.getMenuType())
.build();
}
......
order-application-service/src/main/java/cn/freemud/service/impl/CheckMCCafeOrder.java
......@@ -393,7 +393,7 @@ public class CheckMCCafeOrder {
}
public ShoppingCartGoodsDto getShoppingCartGoodsDto(CreateOrderVo createOrderVo) {
ShoppingCartInfoRequestVo.BuyMemberCard buyMemberCard = null;
// ShoppingCartInfoRequestVo.BuyMemberCard buyMemberCard = null;
// if (createOrderVo.getBuyMemberCard() != null) {
// buyMemberCard = new ShoppingCartInfoRequestVo.BuyMemberCard();
// buyMemberCard.setPaidId(createOrderVo.getBuyMemberCard().getPaidId());
......@@ -409,7 +409,7 @@ public class CheckMCCafeOrder {
.flag(CouponFlag.NO.getCode())
.receiveId(createOrderVo.getReceiveId())
.useCustomerScore(createOrderVo.getUseCustomerScore())
.buyMemberCard(buyMemberCard)
// .buyMemberCard(buyMemberCard)
.menuType(createOrderVo.getMenuType())
.build();
// 如果使用优惠券或者商品券，校验 couponCode
......@@ -470,7 +470,7 @@ public class CheckMCCafeOrder {
.flag(CouponFlag.NO.getCode())
.receiveId(createOrderVo.getReceiveId())
.useCustomerScore(createOrderVo.getUseCustomerScore())
.buyMemberCard(null)
// .buyMemberCard(null)
.menuType(createOrderVo.getMenuType())
.buyMonthlyCard(createOrderVo.getBuyMonthlyCard())
.monthlyCardCode(createOrderVo.getMonthlyCardCode())
......
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
......@@ -754,7 +754,7 @@ public class CheckOrder {
}
public ShoppingCartGoodsDto getShoppingCartGoodsDto(CreateOrderVo createOrderVo) {
ShoppingCartInfoRequestVo.BuyMemberCard buyMemberCard = null;
// ShoppingCartInfoRequestVo.BuyMemberCard buyMemberCard = null;
// if (createOrderVo.getBuyMemberCard() != null) {
// buyMemberCard = new ShoppingCartInfoRequestVo.BuyMemberCard();
// buyMemberCard.setPaidId(createOrderVo.getBuyMemberCard().getPaidId());
......@@ -770,7 +770,7 @@ public class CheckOrder {
.flag(CouponFlag.NO.getCode())
.receiveId(createOrderVo.getReceiveId())
.useCustomerScore(createOrderVo.getUseCustomerScore())
.buyMemberCard(buyMemberCard)
// .buyMemberCard(null)
.menuType(createOrderVo.getMenuType())
.useCouponFlag(1)//结算页
//.flag(1)
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -41,6 +41,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.dto.store.StoreMixResponseDto;
import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest;
import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
import cn.freemud.entities.vo.order.OrderAppealVo;
import cn.freemud.entities.vo.order.QueryOrderAppealResponseVo;
import cn.freemud.enums.OrderType;
......@@ -2503,7 +2504,7 @@ public class OrderServiceImpl implements Orderservice {
private void preSetPayChannelType(BaseCreateOrderRequest request, CreateOrderVo createOrderVo) {
Long amount = request.getAmount();
String cardCode = createOrderVo.getCardCode();
CreateOrderVo.UnionPayCard unionPayCard = createOrderVo.getUnionPayCard();
CreateOrderUnionPayCardVo unionPayCard = createOrderVo.getUnionPayCard();
if (amount > 0) {
PayChannelType channelType = null;
// 风味卡支付
......
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
......@@ -18,6 +18,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.CreateOrderResponseVo;
import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.PaysuccessNoticeMessage;
import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
......@@ -408,7 +409,7 @@ public class PayServiceImpl {
* 电子风味卡支付
* unionPay card pay
*/
private OrderPayResponse uSvcPay(OrderBeanV1 orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderVo.UnionPayCard unionPayCard) {
private OrderPayResponse uSvcPay(OrderBeanV1 orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderUnionPayCardVo unionPayCard) {
OrderPayResponse orderPayResponse = new OrderPayResponse();
if (Objects.isNull(unionPayCard) || StringUtils.isBlank(unionPayCard.getCode()) || StringUtils.isBlank(unionPayCard.getPassword())) {
orderPayResponse.setMsg("电子风味卡信息缺失");
......
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
......@@ -21,6 +21,7 @@ import cn.freemud.entities.dto.pay.PaymentMqMessageDto;
import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.redis.RedisCache;
......@@ -642,7 +643,7 @@ public abstract class UniversalOrderService {
Integer serviceTime = storeResponseDto.getServiceTime();
String sessionId = createOrderBaseVo.getSessionId();
String version = createOrderBaseVo.getVersion();
CreateOrderBaseVo.BuyMemberCard memberCard = createOrderBaseVo.getBuyMemberCard();
// CreateOrderBaseVo.BuyMemberCard memberCard = createOrderBaseVo.getBuyMemberCard();
String deliveryHoursDayStart = "";
String deliveryHoursDayEnd = "";
......@@ -666,9 +667,9 @@ public abstract class UniversalOrderService {
// pushOrderTime 在master 版本中 一直都是 0
orderExtInfoDto.setPushOrderTime(0);
orderExtInfoDto.setVersion(version);
if (memberCard != null && memberCard.getRuleId() != null) {
orderExtInfoDto.setRuleId(memberCard.getRuleId());
}
// if (memberCard != null && memberCard.getRuleId() != null) {
// orderExtInfoDto.setRuleId(memberCard.getRuleId());
// }
// 扩展字段中存储 sessionKey
orderExtInfoDto.setSessionKey(userLoginInfoDto.getSessionKey());
orderExtInfoDto.setFormId(createOrderBaseVo.getFormId());
......@@ -1200,7 +1201,7 @@ public abstract class UniversalOrderService {
* @param unionPayCard
* @return
*/
private OrderPayResponse uSvcPay(OrderBeanV1 orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderVo.UnionPayCard unionPayCard) {
private OrderPayResponse uSvcPay(OrderBeanV1 orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderUnionPayCardVo unionPayCard) {
OrderPayResponse orderPayResponse = new OrderPayResponse();
if (Objects.isNull(unionPayCard) || StringUtils.isBlank(unionPayCard.getCode()) || StringUtils.isBlank(unionPayCard.getPassword())) {
orderPayResponse.setMsg("电子风味卡信息缺失");
......
order-application-service/src/test/java/cn.freemud/controller/OrderControllerTest.java
......@@ -58,7 +58,7 @@ public class OrderControllerTest {
request.setShopId("1036");
request.setOrderType(1);
// request.setTakeMealTime("12:00");
request.setTakeOut(0);
// request.setTakeOut(0);
request.setOrderRemark("不加香菜");
String str = JSONObject.toJSONString(request);
try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment