删除自提点

src/main/java/com/uas/platform/b2c/common/psmessage/service/impl/MessageServiceImpl.java

@@ -110,6 +110,9 @@ public class MessageServiceImpl implements MessageService {
         map.put("page", params.getPage());
         map.put("count", params.getCount());
         map.put("sorting", "{\"createTime\":\"DESC\"}");
+        if (!StringUtils.isEmpty(type)) {
+            map.put("type", type);
+        }
         User user = SystemSession.getUser();
         if (user != null) {
             map.put("receiverUu", user.getUserUU());
@@ -119,7 +122,7 @@ public class MessageServiceImpl implements MessageService {
             }
         }
         try {
-            HttpUtil.Response response = HttpUtil.sendGetRequest(sysConf.getMessageServiceUrl() + "messages", map);
+            HttpUtil.Response response = HttpUtil.sendGetRequest(sysConf.getMessageServiceUrl() + "/messages", map);
             int statusCode = response.getStatusCode();
             if (statusCode == HttpStatus.OK.value()) {
                 String text = response.getResponseText();

src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/BillSubmitServiceImpl.java

@@ -168,6 +168,7 @@ public class BillSubmitServiceImpl implements BillSubmitService {
 
         // 发票基本信息
         BillSubmit billSubmit = new BillSubmit();
+        billSubmit.setBillInfo(FastjsonUtils.toJson(bill));
         billSubmit.setInvoicetitle(bill.getHead());
         billSubmit.setInvoiceid(bill.getId());
         billSubmit.setInvoiceAddress(bill.getArea() + "," + bill.getDetailAddress());

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -751,10 +751,6 @@ public class OrderServiceImpl implements OrderService {
         //获取适用配送规则列表
         String jsonRule = object.getString("ruleList");
         JSONObject ruleObject = FastjsonUtils.fromJson(jsonRule, JSONObject.class);
-        //获取自提点信息
-        String jsonTake = object.getString("takeList");
-        JSONObject takeObject = FastjsonUtils.fromJson(jsonTake, JSONObject.class);
-
         for (OrderDetail detail : order.getOrderDetails()) {
             List<OrderDetail> orderDetails = listMap.get(detail.getStoreid());
             if (orderDetails == null) {
@@ -803,12 +799,7 @@ public class OrderServiceImpl implements OrderService {
              *  加入运费
              */
             JSONObject rule = ruleObject.getJSONObject(storeid);
-            JSONObject take = takeObject.getJSONObject(storeid);
-            System.out.println(rule);
             or.setJsonRule(FastjsonUtils.toJson(rule));
-            if(take != null){
-                or.setJsonTakeSelf(FastjsonUtils.toJson(take));
-            }
 
             or.setDeliverytype(Integer.parseInt(rule.getString("method")));
             or.setFare(Double.parseDouble(rule.getString("fare")));