|
|
@@ -183,7 +183,10 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
|
|
|
if (StringUtil.isNotBlank(k)) {
|
|
|
// 如果只有一个公司,订单编号和主编号一致
|
|
|
String nowOrderNo = list.size() == 1 ? srcOrdNo: srcOrdNo + "-" + i;
|
|
|
- List<PjShoppingCart> shoppingCartList = JSONArray.parseArray(String.valueOf(map.get("list")), PjShoppingCart.class);
|
|
|
+ // List<PjShoppingCart> shoppingCartList = JSONArray.parseArray(String.valueOf(map.get("list")), PjShoppingCart.class);
|
|
|
+ String jsonStr = JSON.toJSONString(map.get("list"));
|
|
|
+ JSONArray objects = JSONArray.parseArray(jsonStr);
|
|
|
+ List<PjShoppingCart> shoppingCartList = objects.toJavaList(PjShoppingCart.class);
|
|
|
PjOrder order = WxParamUtil.getBaseOrderByCorps(finalCorpsDesc, corpsAttn, bladeUser, nowOrderNo, billNo, deptId, finalCorpsDesc.getCname(), address);
|
|
|
order.setBsType(OrderTypeEnum.SALES.getType());
|
|
|
order.setBusinessSource(OrderTypeEnum.XCX.getType());
|