|
|
|
@ -7,6 +7,7 @@ import cn.chjyj.szwh.mapper.*; |
|
|
|
import cn.chjyj.szwh.service.OrderService; |
|
|
|
import cn.chjyj.szwh.utils.*; |
|
|
|
import cn.chjyj.szwh.vo.OrderDetailVo; |
|
|
|
import com.alibaba.fastjson2.JSON; |
|
|
|
import com.alibaba.fastjson2.JSONArray; |
|
|
|
import com.alibaba.fastjson2.JSONObject; |
|
|
|
import com.sun.org.apache.xpath.internal.operations.Or; |
|
|
|
@ -797,6 +798,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
} |
|
|
|
// 该用户的购物车
|
|
|
|
String rkey="car_"+userIsli; |
|
|
|
String batchcode="";//订单编号,一次一个
|
|
|
|
if(jsonArray.size()==1){ // 下单商品只有一个
|
|
|
|
JSONObject tmpgjson = jsonArray.getJSONObject(0); |
|
|
|
String tuseYear = tmpgjson.getString("use_year"); |
|
|
|
@ -811,18 +813,43 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
retmap.put("msg",berrmsg); |
|
|
|
} |
|
|
|
//返回订单编号
|
|
|
|
String batchcode = (String)bmap.get("batcha"); |
|
|
|
batchcode = (String)bmap.get("batcha"); |
|
|
|
if(StringUtils.isNotEmpty(batchcode)){ |
|
|
|
// 从购物车中删除该goodsisli
|
|
|
|
SzOrderUtils.delOdGoodsIsliFromCar(rkey,goodsIsli); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
//
|
|
|
|
// 多个商品同时结算
|
|
|
|
} |
|
|
|
|
|
|
|
//1、订单号一个 2、用户一个 3、订单商品(一)多个 4、操作购物车
|
|
|
|
// export order map
|
|
|
|
// order basic \order goods |order user
|
|
|
|
retmap = getOrderMapByBatch(batchcode,userIsli); |
|
|
|
return retmap; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 根据订单号列举出所有相关 |
|
|
|
* @param batchcode 订单号 |
|
|
|
* @param userIsli 用户编号 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public Map<String,Object> getOrderMapByBatch(String batchcode,String userIsli){ |
|
|
|
Map<String,Object> otmap = new HashMap<>(); |
|
|
|
// 查询以后
|
|
|
|
Order order = orderMapper.getOrderByBatchcode(batchcode); |
|
|
|
//订单信息 初始化该map
|
|
|
|
otmap= JSONObject.parseObject(JSON.toJSONString(order)); |
|
|
|
// 订单用户
|
|
|
|
OrderUser orderUser = orderUserMapper.getUserOrder(batchcode,userIsli); |
|
|
|
otmap.put("buy_userinfo",orderUser); |
|
|
|
otmap.put("buy_username",orderUser.getName()); |
|
|
|
// order goods
|
|
|
|
List<OrderGoodsDetail> orderGoodsDetailList =orderGoodsDetailMapper.getOrderGoodsDetailByBatchCode(batchcode); |
|
|
|
otmap.put("order_detail",orderGoodsDetailList); |
|
|
|
//
|
|
|
|
return otmap; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 结算 |
|
|
|
|