Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
edb952695e |
@@ -84,6 +84,7 @@ public class TbCashierCart implements Serializable {
|
|||||||
private String proGroupInfo;
|
private String proGroupInfo;
|
||||||
private String typeEnum;
|
private String typeEnum;
|
||||||
private Integer groupType;
|
private Integer groupType;
|
||||||
|
private int isWeight;
|
||||||
|
|
||||||
public String getSkuName() {
|
public String getSkuName() {
|
||||||
if(StringUtils.isNotBlank(skuName)){
|
if(StringUtils.isNotBlank(skuName)){
|
||||||
@@ -116,4 +117,5 @@ public class TbCashierCart implements Serializable {
|
|||||||
return BigDecimal.valueOf(num).multiply(salePrice);
|
return BigDecimal.valueOf(num).multiply(salePrice);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,4 +52,6 @@ public class TbOrderDetail implements Serializable {
|
|||||||
private String useCouponInfo;
|
private String useCouponInfo;
|
||||||
private BigDecimal canReturnAmount;
|
private BigDecimal canReturnAmount;
|
||||||
private String proGroupInfo;
|
private String proGroupInfo;
|
||||||
|
private int isWeight;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -698,6 +698,7 @@ public class CartService {
|
|||||||
cashierCart.setNumber(num);
|
cashierCart.setNumber(num);
|
||||||
cashierCart.setTotalNumber(num);
|
cashierCart.setTotalNumber(num);
|
||||||
}
|
}
|
||||||
|
cashierCart.setIsWeight("weigh".equals(product.getType()) ? 1 : 0);
|
||||||
cashierCart.setTypeEnum(product.getTypeEnum());
|
cashierCart.setTypeEnum(product.getTypeEnum());
|
||||||
cashierCart.setGroupType(product.getGroupType());
|
cashierCart.setGroupType(product.getGroupType());
|
||||||
cashierCart.setNote(note);
|
cashierCart.setNote(note);
|
||||||
@@ -1204,6 +1205,7 @@ public class CartService {
|
|||||||
orderDetail.setProductSkuName(productSku.getSpecSnap());
|
orderDetail.setProductSkuName(productSku.getSpecSnap());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
orderDetail.setIsWeight(cashierCart.getIsWeight());
|
||||||
orderDetail.setProGroupInfo(cashierCart.getProGroupInfo());
|
orderDetail.setProGroupInfo(cashierCart.getProGroupInfo());
|
||||||
orderDetail.setMemberPrice(cashierCart.getMemberPrice());
|
orderDetail.setMemberPrice(cashierCart.getMemberPrice());
|
||||||
orderDetail.setNote(cashierCart.getNote());
|
orderDetail.setNote(cashierCart.getNote());
|
||||||
|
|||||||
Reference in New Issue
Block a user