|
@@ -168,7 +168,7 @@ public class MallOrderController {
|
|
|
salesOrder.setSalesStatus(1);
|
|
|
salesOrder.setSalesSendType(2);
|
|
|
salesOrder.setSalesSalesTime(add_time);
|
|
|
- salesOrder.setSalesAddressInfo(province_name+"-"+city_name+"-"+district_name+"-"+address);
|
|
|
+ salesOrder.setSalesAddressInfo(province_name+" "+city_name+" "+district_name+" "+address);
|
|
|
salesOrder.setSalesAddressTel(mobile);
|
|
|
salesOrder.setSalesAddressName(consignee);
|
|
|
salesOrder.setSalesAmount(total_amount);
|
|
@@ -235,7 +235,7 @@ public class MallOrderController {
|
|
|
}catch (Exception e){
|
|
|
map.put("msg","parameter null");
|
|
|
map.put("oder_sn",new Date().getTime());
|
|
|
- return null;
|
|
|
+ return map;
|
|
|
}
|
|
|
if (salesOrder == null) {
|
|
|
map.put("msg","no order");
|