|
@@ -171,7 +171,8 @@ public class EfastOrderServiceImpl implements EfastOrderService {
|
|
|
List<OrderItem> items = adminOrderService.getShopOrderItemByOrderId(order.getSalesOrderid());
|
|
|
|
|
|
|
|
|
- String url = NameUtils.getConfig("efast_base_url");
|
|
|
+
|
|
|
+ String url = NameUtils.getConfig("rst_efast_base_url");
|
|
|
|
|
|
|
|
|
Map<String, String> requestData = new HashMap<String, String>();
|
|
@@ -198,12 +199,13 @@ public class EfastOrderServiceImpl implements EfastOrderService {
|
|
|
|
|
|
* 系统级参数
|
|
|
*/
|
|
|
- requestData.put("app_nick", NameUtils.getConfig("app_nick"));
|
|
|
+
|
|
|
requestData.put("app_key", NameUtils.getConfig("app_key"));
|
|
|
requestData.put("app_secret", NameUtils.getConfig("app_secret"));
|
|
|
requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
|
|
|
- requestData.put("app_act", message.getServiceOtherMessage());
|
|
|
-
|
|
|
+ requestData.put("app_act", message.getServiceOtherMessage());*/
|
|
|
+ requestData.put("app_act", "rst.trade.new.add");
|
|
|
+
|
|
|
|
|
|
* 订单基本信息
|
|
|
*/
|
|
@@ -235,12 +237,12 @@ public class EfastOrderServiceImpl implements EfastOrderService {
|
|
|
orderData.put("consignee", order.getSalesAddressName());
|
|
|
orderData.put("district_name", addressDesc[2]);
|
|
|
orderData.put("email", "");
|
|
|
- orderData.put("goods_amount", (order.getSalesAmount()/100.0));
|
|
|
+ orderData.put("goods_amount", order.getSalesAmount());
|
|
|
orderData.put("goods_count", items.size());
|
|
|
orderData.put("mobile", order.getSalesAddressTel());
|
|
|
- orderData.put("money_paid", (money/100.0));
|
|
|
+ orderData.put("money_paid", money);
|
|
|
orderData.put("oid", order.getSalesOrderid());
|
|
|
- orderData.put("order_amount", (order.getSalesAmount()/100.0));
|
|
|
+ orderData.put("order_amount", order.getSalesAmount());
|
|
|
|
|
|
|
|
|
* 产品信息
|
|
@@ -250,23 +252,27 @@ public class EfastOrderServiceImpl implements EfastOrderService {
|
|
|
Map<String, Object> orders1 = new HashMap<String, Object>();
|
|
|
orders1.put("goods_name", item.getItemProductName());
|
|
|
orders1.put("goods_number", item.getItemNum());
|
|
|
- orders1.put("goods_price", (item.getItemProductPrice()/100.0));
|
|
|
+ orders1.put("goods_price", item.getItemProductPrice());
|
|
|
orders1.put("outer_sku", item.getProduectRemark());
|
|
|
- orders1.put("payment_ft", (item.getItemProductDiscount()/100.0));
|
|
|
+ orders1.put("payment_ft", item.getItemProductDiscount());
|
|
|
maps.add(orders1);
|
|
|
}
|
|
|
|
|
|
orderData.put("orders", maps);
|
|
|
orderData.put("pay_name", "weixinpay");
|
|
|
- orderData.put("pay_time", DateTimeUtil.format(order.getSalesTransactionDate()));
|
|
|
+ if(order.getSalesTransactionDate() != null){
|
|
|
+ orderData.put("pay_time", DateTimeUtil.format(order.getSalesTransactionDate()));
|
|
|
+ }else{
|
|
|
+ orderData.put("pay_time", "");
|
|
|
+ }
|
|
|
orderData.put("postscript", order.getSalesUserRemark());
|
|
|
orderData.put("province_name", provinceName);
|
|
|
orderData.put("sd_id", "001");
|
|
|
orderData.put("shipping_fee", 0);
|
|
|
orderData.put("shipping_name", "yto");
|
|
|
- orderData.put("tel", "");
|
|
|
+ orderData.put("tel", order.getSalesAddressTel());
|
|
|
orderData.put("to_buyer", "");
|
|
|
- orderData.put("total_amount", (order.getSalesAmount()/100.0));
|
|
|
+ orderData.put("total_amount", order.getSalesAmount());
|
|
|
orderData.put("user_name", order.getSalesOpenid());
|
|
|
orderData.put("zipcode", order.getSalesAddressPostnum());
|
|
|
|
|
@@ -284,7 +290,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
|
|
|
logger.info("推送订单:" + requestData);
|
|
|
|
|
|
try {
|
|
|
- String result = HttpClient431Util.doGet(requestData, url);
|
|
|
+ String result = HttpClient431Util.doPost(requestData, url);
|
|
|
result = StringEscapeUtils.unescapeJava(result);
|
|
|
logger.info("add-推送订单号为:" + order.getSalesOrderid() + "的订单,百胜返回信息:" + result);
|
|
|
|