|
|
@@ -259,7 +259,7 @@ public class OrderHandler {
|
|
|
dto.setBalance(member.getUserIncome());
|
|
|
|
|
|
ActivityDate activityDate = activityUtil.doubleTwelve();
|
|
|
- if(activityDate.isStatus()&& activityUtil.getFullReduction(member.getUserOpenid())){
|
|
|
+ if(activityDate.isStatus() && activityUtil.getFullReduction(member.getUserOpenid())){
|
|
|
dto.setUser38Interests(1); //有权益
|
|
|
}else{
|
|
|
dto.setUser38Interests(2); //无权益
|
|
|
@@ -374,7 +374,7 @@ public class OrderHandler {
|
|
|
cartDto.setProductStatus(1);
|
|
|
cartDto.setTotal(productColor.getColorDiscount());
|
|
|
cartDto.setProductColor(productColor.getColorName());
|
|
|
- cartDto.setColorImg(productColor.getColorProductPic());
|
|
|
+ cartDto.setColorImg(productColor.getColorImg());
|
|
|
cartDtos.add(cartDto);
|
|
|
}
|
|
|
}
|
|
|
@@ -432,7 +432,7 @@ public class OrderHandler {
|
|
|
item.setItemProductDiscount(cartDto.getProductPrice());
|
|
|
item.setItemProductId(cartDto.getCartProductId());
|
|
|
item.setItemProductName(cartDto.getProductName());
|
|
|
- item.setItemProductPic(cartDto.getProductIntroduceImg());
|
|
|
+ item.setItemProductPic(cartDto.getColorImg());
|
|
|
item.setItemSalesOrderid(order.getSalesOrderid());
|
|
|
item.setItemTotal(subTotal);
|
|
|
item.setItemProductType(cartDto.getProductType());
|
|
|
@@ -554,6 +554,9 @@ public class OrderHandler {
|
|
|
item.setItemColorId(productColor.getColorId());
|
|
|
list.add(item);
|
|
|
}
|
|
|
+ if(total > 300000){
|
|
|
+ total = total - 10000;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if(total==0 || total<0){
|
