|
@@ -356,7 +356,7 @@ public class FsIntegralOrderServiceImpl implements IFsIntegralOrderService
|
|
|
order.setIntegral(totalIntegral.toString());
|
|
order.setIntegral(totalIntegral.toString());
|
|
|
order.setItemJson(JSONUtil.toJsonStr(goodsItem));
|
|
order.setItemJson(JSONUtil.toJsonStr(goodsItem));
|
|
|
order.setUserName(address.getRealName());
|
|
order.setUserName(address.getRealName());
|
|
|
- order.setUserAddress(address.getProvince()+address.getCity()+address.getDistrict()+address.getDetail());
|
|
|
|
|
|
|
+ order.setUserAddress(address.getProvince()+" "+address.getCity()+" "+address.getDistrict()+" "+address.getDetail());
|
|
|
order.setUserPhone(address.getPhone());
|
|
order.setUserPhone(address.getPhone());
|
|
|
order.setCreateTime(new Date());
|
|
order.setCreateTime(new Date());
|
|
|
order.setCompanyUserId(companyUserId);
|
|
order.setCompanyUserId(companyUserId);
|
|
@@ -855,7 +855,7 @@ public class FsIntegralOrderServiceImpl implements IFsIntegralOrderService
|
|
|
List<ErpOrderPayment> payments = new ArrayList<>();
|
|
List<ErpOrderPayment> payments = new ArrayList<>();
|
|
|
ErpOrderPayment payment = new ErpOrderPayment();
|
|
ErpOrderPayment payment = new ErpOrderPayment();
|
|
|
payment.setPay_type_code("weixin");
|
|
payment.setPay_type_code("weixin");
|
|
|
- payment.setPayment(order.getPayMoney().doubleValue());
|
|
|
|
|
|
|
+ payment.setPayment(0d);
|
|
|
if (order.getPayTime() != null) {
|
|
if (order.getPayTime() != null) {
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
String timeString = sdf.format(Date.from((order.getPayTime().atZone(ZoneId.systemDefault()).toInstant())));
|
|
String timeString = sdf.format(Date.from((order.getPayTime().atZone(ZoneId.systemDefault()).toInstant())));
|
|
@@ -935,7 +935,7 @@ public class FsIntegralOrderServiceImpl implements IFsIntegralOrderService
|
|
|
JSONObject jsonObject = (JSONObject) obj;
|
|
JSONObject jsonObject = (JSONObject) obj;
|
|
|
ErpOrderItem item = new ErpOrderItem();
|
|
ErpOrderItem item = new ErpOrderItem();
|
|
|
item.setOid(jsonObject.getString("goodsId"));
|
|
item.setOid(jsonObject.getString("goodsId"));
|
|
|
- item.setItem_code(jsonObject.getString("barCode").trim());//商品编码
|
|
|
|
|
|
|
+ item.setItem_code(jsonObject.getString("barCode"));//商品编码
|
|
|
item.setPrice(jsonObject.getString("otPrice"));//市场价
|
|
item.setPrice(jsonObject.getString("otPrice"));//市场价
|
|
|
item.setQty(jsonObject.getInteger("num"));//数量
|
|
item.setQty(jsonObject.getInteger("num"));//数量
|
|
|
item.setRefund(0);
|
|
item.setRefund(0);
|