|
@@ -18,6 +18,7 @@ import com.iamberry.rst.service.sys.mapper.SysConfigMapper;
|
|
|
import com.iamberry.rst.util.PageUtil;
|
|
|
import com.iamberry.wechat.tools.DateTimeUtil;
|
|
|
import net.sf.json.JSONArray;
|
|
|
+import net.sf.json.JSONNull;
|
|
|
import net.sf.json.JSONObject;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
@@ -257,22 +258,27 @@ public class SalesOrderServiceImpl implements SalesOrderService {
|
|
|
salesOrder.setSalesIsLocked(order.getInt("is_locked"));
|
|
|
salesOrder.setSalesIsSeparate(order.getInt("is_separate"));
|
|
|
salesOrder.setSalesStatus(order.getInt("order_status"));
|
|
|
- salesOrder.setSalesPostFirm(order.getString("shipping_name"));
|
|
|
- salesOrder.setSalesPostNum(order.getString("invoice_no"));
|
|
|
- salesOrder.setSalesOpenId(order.getString("mobile"));
|
|
|
- salesOrder.setSalesPayType(efastOrderService.getPayType(order.getString("pay_name")));
|
|
|
+ salesOrder.setSalesPostFirm(order.getString("shipping_name").trim());
|
|
|
+ salesOrder.setSalesPostNum(order.getString("invoice_no").trim());
|
|
|
+ salesOrder.setSalesOpenId(order.getString("mobile").trim());
|
|
|
+ salesOrder.setSalesPayType(efastOrderService.getPayType(order.getString("pay_name").trim()));
|
|
|
salesOrder.setSalesPayTime(new Date(order.getLong("pay_time")*1000));
|
|
|
salesOrder.setSalesUserRemark(order.getString("postscript"));
|
|
|
salesOrder.setSalesAdminRemark(order.getString("to_buyer"));
|
|
|
salesOrder.setSalesAmount((int)(order.getDouble("order_amount")*100));
|
|
|
salesOrder.setSalesPayMoney((int)(order.getDouble("money_paid")*100));
|
|
|
- salesOrder.setSalesAddressName(order.getString("consignee"));
|
|
|
- salesOrder.setSalesAddressTel(order.getString("mobile"));
|
|
|
+ salesOrder.setSalesAddressName(order.getString("consignee").trim());
|
|
|
+ String mobile = order.getString("mobile").replaceAll("[\\u00A0]+", "").trim();
|
|
|
+ salesOrder.setSalesAddressTel(mobile);
|
|
|
salesOrder.setSalesAddressInfo(order.getString("address").replaceAll(" ","-"));
|
|
|
salesOrder.setSalesShippingFee((int)(order.getDouble("shipping_fee")*100));
|
|
|
salesOrder.setSalesCreateTime(DateTimeUtil.parse(order.getString("create_time"),"yyyy-MM-dd HH:mm:ss"));
|
|
|
- if (StringUtils.isNotEmpty(order.getString("delivery_time"))) {
|
|
|
- salesOrder.setSalesSendTime(DateTimeUtil.parse(order.getString("delivery_time"),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ if (order.getInt("shipping_status") == 1) {
|
|
|
+ if(order.has("delivery_time")){
|
|
|
+ salesOrder.setSalesSendTime(DateTimeUtil.parse(order.getString("delivery_time"),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ }else{
|
|
|
+ salesOrder.setSalesSendTime(new Date());
|
|
|
+ }
|
|
|
}
|
|
|
salesOrder.setSalesDiscountMoney(salesOrder.getSalesAmount() - salesOrder.getSalesPayMoney());
|
|
|
salesOrder.setSalesPledgeMoney(0);
|
|
@@ -381,22 +387,27 @@ public class SalesOrderServiceImpl implements SalesOrderService {
|
|
|
salesOrder.setSalesIsLocked(orderInfo.getInt("is_locked"));
|
|
|
salesOrder.setSalesIsSeparate(orderInfo.getInt("is_separate"));
|
|
|
salesOrder.setSalesStatus(orderInfo.getInt("order_status"));
|
|
|
- salesOrder.setSalesPostFirm(orderInfo.getString("shipping_name"));
|
|
|
- salesOrder.setSalesPostNum(orderInfo.getString("invoice_no"));
|
|
|
- salesOrder.setSalesOpenId(orderInfo.getString("mobile"));
|
|
|
- salesOrder.setSalesPayType(efastOrderService.getPayType(orderInfo.getString("pay_name")));
|
|
|
+ salesOrder.setSalesPostFirm(new String(orderInfo.getString("shipping_name")).trim());
|
|
|
+ salesOrder.setSalesPostNum(new String(orderInfo.getString("invoice_no")).trim());
|
|
|
+ salesOrder.setSalesOpenId(orderInfo.getString("mobile").trim());
|
|
|
+ salesOrder.setSalesPayType(efastOrderService.getPayType(orderInfo.getString("pay_name").trim()));
|
|
|
salesOrder.setSalesPayTime(new Date(orderInfo.getLong("pay_time")*1000));
|
|
|
salesOrder.setSalesUserRemark(orderInfo.getString("postscript"));
|
|
|
salesOrder.setSalesAdminRemark(orderInfo.getString("to_buyer"));
|
|
|
salesOrder.setSalesAmount((int)(orderInfo.getDouble("order_amount")*100));
|
|
|
salesOrder.setSalesPayMoney((int)(orderInfo.getDouble("money_paid")*100));
|
|
|
salesOrder.setSalesAddressName(orderInfo.getString("consignee"));
|
|
|
- salesOrder.setSalesAddressTel(orderInfo.getString("mobile"));
|
|
|
+ String mobile = orderInfo.getString("mobile").replaceAll("[\\u00A0]+", "");
|
|
|
+ salesOrder.setSalesAddressTel(mobile.trim());
|
|
|
salesOrder.setSalesAddressInfo(orderInfo.getString("address").replaceAll(" ","-"));
|
|
|
salesOrder.setSalesShippingFee((int)(orderInfo.getDouble("shipping_fee")*100));
|
|
|
salesOrder.setSalesCreateTime(new Date(orderInfo.getLong("pay_time")*1000));
|
|
|
if (orderInfo.getInt("shipping_status") == 1) {
|
|
|
- salesOrder.setSalesSendTime(DateTimeUtil.parse(orderInfo.getString("delivery_time"),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ if(orderInfo.has("delivery_time")){
|
|
|
+ salesOrder.setSalesSendTime(DateTimeUtil.parse(orderInfo.getString("delivery_time"),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ }else{
|
|
|
+ salesOrder.setSalesSendTime(new Date());
|
|
|
+ }
|
|
|
}
|
|
|
salesOrder.setSalesDiscountMoney(salesOrder.getSalesAmount() - salesOrder.getSalesPayMoney());
|
|
|
salesOrder.setSalesPledgeMoney(0);
|