|
@@ -104,9 +104,16 @@ public class OrderServiceImpl implements OrderService {
|
|
BigDecimal expensesOfTaxation = new BigDecimal(0);
|
|
BigDecimal expensesOfTaxation = new BigDecimal(0);
|
|
int returnedNumTotal = 0;
|
|
int returnedNumTotal = 0;
|
|
int actualCancelNumTotal = 0;
|
|
int actualCancelNumTotal = 0;
|
|
|
|
+ String helpContent=null;
|
|
|
|
+ boolean flag=false;
|
|
for (ShopOrderVo shopOrder : shopOrderList) {
|
|
for (ShopOrderVo shopOrder : shopOrderList) {
|
|
List<OrderProductVo> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderId());
|
|
List<OrderProductVo> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderId());
|
|
for (OrderProductVo orderProduct : orderProductList) {
|
|
for (OrderProductVo orderProduct : orderProductList) {
|
|
|
|
+ //订单中存在不能退货的商品则给出不能退货提示
|
|
|
|
+ if(null!=orderProduct.getReturnGoodsStutas()&&orderProduct.getReturnGoodsStutas()==2){
|
|
|
|
+ flag=true;
|
|
|
|
+ helpContent = orderMapper.getHelpContent(1040);
|
|
|
|
+ }
|
|
//运费
|
|
//运费
|
|
if (shopOrder.getShopId() == 998) {
|
|
if (shopOrder.getShopId() == 998) {
|
|
order.setFreight(orderProduct.getPrice());
|
|
order.setFreight(orderProduct.getPrice());
|
|
@@ -163,6 +170,13 @@ public class OrderServiceImpl implements OrderService {
|
|
map.put("userInfo", userInfo);
|
|
map.put("userInfo", userInfo);
|
|
map.put("shopOrderList", shopOrderList);
|
|
map.put("shopOrderList", shopOrderList);
|
|
map.put("discernReceiptList", discernReceiptList);
|
|
map.put("discernReceiptList", discernReceiptList);
|
|
|
|
+ if(flag){
|
|
|
|
+ map.put("returnGoodsStutas", 2);
|
|
|
|
+ map.put("helpContent", helpContent);
|
|
|
|
+ }else{
|
|
|
|
+ map.put("returnGoodsStutas", 1);
|
|
|
|
+ map.put("helpContent", null);
|
|
|
|
+ }
|
|
return ResponseJson.success(map);
|
|
return ResponseJson.success(map);
|
|
}
|
|
}
|
|
|
|
|