| | |
|---|
| | | orderPage.setAppUserIds(orderPage.getAppUserIds().stream().distinct().collect(Collectors.toList())); |
|---|
| | | } |
|---|
| | | |
|---|
| | | // UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class); |
|---|
| | | // orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone()); |
|---|
| | | // userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress()); |
|---|
| | | // orderInfo.setAddress(userAddress.getRecieveAddress()); |
|---|
| | | |
|---|
| | | |
|---|
| | | List<OrderExport> orderExportList = orderMapper.getOrderExportList(orderPage); |
|---|
| | |
|---|
| | | orderExport.setGoodsName(goods.getName()); |
|---|
| | | /* orderExport.setCompanyCostPrice(goods.getOperatingCost()); |
|---|
| | | orderExport.setSupplierCostPrice(goods.getShopCost());*/ |
|---|
| | | } |
|---|
| | | |
|---|
| | | String expressJson = orderExport.getExpressJson(); |
|---|
| | | if (StringUtils.isNotEmpty(expressJson) && !expressJson.equals("NULL")) { |
|---|
| | | JSONObject jsonObject = JSONObject.parseObject(expressJson); |
|---|
| | | orderExport.setExpressNum(jsonObject.getString("num")); |
|---|
| | | orderExport.setExpressName(ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com"))); |
|---|
| | | } |
|---|
| | | }); |
|---|
| | | |
|---|
