Commit a5bc6a23 by 周晓航

修改 内部内使用

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent d48bbb91
package cn.freemud.demo.entities.bo.goods; package cn.freemud.demo.entities.bo.goods;
import cn.freemud.demo.entities.bo.SendGoods;
import cn.freemud.entities.vo.CartGoods; import cn.freemud.entities.vo.CartGoods;
import cn.freemud.entities.vo.CreateOrderVo; import cn.freemud.entities.vo.CreateOrderVo;
import lombok.Data; import lombok.Data;
...@@ -138,23 +139,6 @@ public class ShoppingCartGoodsApportionBO { ...@@ -138,23 +139,6 @@ public class ShoppingCartGoodsApportionBO {
private Integer couponType; private Integer couponType;
} }
@Data
public final static class SendGoods {
/**
* 商品Id
*/
@NotNull
private String goodsId;
private Long originalPrice;
/**
* 商品数量
*/
@NotNull
private Integer qty;
private String activityCode;
}
@Data @Data
......
...@@ -2,7 +2,7 @@ package cn.freemud.demo.service.impl; ...@@ -2,7 +2,7 @@ package cn.freemud.demo.service.impl;
import cn.freemud.adapter.CouponAdapter; import cn.freemud.adapter.CouponAdapter;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import cn.freemud.demo.entities.bo.goods.ValidateShopProductRequestBO; import cn.freemud.demo.entities.bo.SendGoods;
import cn.freemud.demo.entities.bo.goods.*; import cn.freemud.demo.entities.bo.goods.*;
import cn.freemud.demo.entities.bo.promotion.GetCalculationDiscountBO; import cn.freemud.demo.entities.bo.promotion.GetCalculationDiscountBO;
import cn.freemud.demo.entities.bo.store.GetStoreBO; import cn.freemud.demo.entities.bo.store.GetStoreBO;
...@@ -13,7 +13,6 @@ import cn.freemud.entities.dto.GetMemberCouponListRequestDto; ...@@ -13,7 +13,6 @@ import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
import cn.freemud.entities.dto.GetMemberCouponListResponseDto; import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
import cn.freemud.entities.vo.ActivityClassifyCouponBean; import cn.freemud.entities.vo.ActivityClassifyCouponBean;
import cn.freemud.entities.vo.CartGoods; import cn.freemud.entities.vo.CartGoods;
import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
import cn.freemud.enums.*; import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException; import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.CouponService; import cn.freemud.service.CouponService;
...@@ -74,11 +73,11 @@ public class PlatformApportionService extends AbstractApportionService { ...@@ -74,11 +73,11 @@ public class PlatformApportionService extends AbstractApportionService {
buildCoupons(coupons, baseRequestDTO.getCouponCodes()); buildCoupons(coupons, baseRequestDTO.getCouponCodes());
List<ShoppingCartGoodsApportionBO.SendGoods> sendGoodsList = baseRequestDTO.getSendGoods(); List<SendGoods> sendGoodsList = baseRequestDTO.getSendGoods();
List<ShoppingCartInfoRequestVo.SendGoods> sendGoods = new ArrayList<>(); List<SendGoods> sendGoods = new ArrayList<>();
if (CollectionUtils.isNotEmpty(sendGoodsList)) { if (CollectionUtils.isNotEmpty(sendGoodsList)) {
for (ShoppingCartGoodsApportionBO.SendGoods sds : sendGoodsList) { for (SendGoods sds : sendGoodsList) {
ShoppingCartInfoRequestVo.SendGoods sd = new ShoppingCartInfoRequestVo.SendGoods(); SendGoods sd = new SendGoods();
sd.setGoodsId(sds.getGoodsId()); sd.setGoodsId(sds.getGoodsId());
if (StringUtils.isBlank(sds.getActivityCode())) continue; if (StringUtils.isBlank(sds.getActivityCode())) continue;
sd.setQty(sds.getQty()); sd.setQty(sds.getQty());
...@@ -121,7 +120,7 @@ public class PlatformApportionService extends AbstractApportionService { ...@@ -121,7 +120,7 @@ public class PlatformApportionService extends AbstractApportionService {
List<GetCalculationDiscountBO.CalculationSendGoodsReqVO> sends = new ArrayList<>(); List<GetCalculationDiscountBO.CalculationSendGoodsReqVO> sends = new ArrayList<>();
List<GetCalculationDiscountBO.CalculationActivityReqVO> selectActivityLists = new ArrayList<>(); List<GetCalculationDiscountBO.CalculationActivityReqVO> selectActivityLists = new ArrayList<>();
GetCalculationDiscountBO.CalculationActivityReqVO calculationActivityReqVO = new GetCalculationDiscountBO.CalculationActivityReqVO(); GetCalculationDiscountBO.CalculationActivityReqVO calculationActivityReqVO = new GetCalculationDiscountBO.CalculationActivityReqVO();
for (ShoppingCartGoodsApportionBO.SendGoods send : sendGoodsList) { for (SendGoods send : sendGoodsList) {
GetCalculationDiscountBO.CalculationSendGoodsReqVO reqs = new GetCalculationDiscountBO.CalculationSendGoodsReqVO(); GetCalculationDiscountBO.CalculationSendGoodsReqVO reqs = new GetCalculationDiscountBO.CalculationSendGoodsReqVO();
reqs.setGoodsId(send.getGoodsId()); reqs.setGoodsId(send.getGoodsId());
reqs.setGoodsQuantity(send.getQty()); reqs.setGoodsQuantity(send.getQty());
......
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