|
@@ -16,6 +16,8 @@ import com.iamberry.wechat.tools.AddrUtil;
|
|
|
import com.iamberry.wechat.tools.HttpClient431Util;
|
|
|
import com.iamberry.wechat.tools.ResponseJson;
|
|
|
import com.iamberry.wechat.tools.UUIDGenerator;
|
|
|
+import com.iamberry.wechat.tools.payUtil.StringUtil;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -201,9 +203,12 @@ public class AwaitSendController {
|
|
|
// 省外EMS (无需操作)
|
|
|
} else if (post.equalsIgnoreCase("STO")) {
|
|
|
// 申通快递
|
|
|
- eOrderRequestData.setCustomerName("爱贝源");
|
|
|
- eOrderRequestData.setCustomerPwd("Iamberry321.");
|
|
|
- eOrderRequestData.setSendSite("广东东莞公司");
|
|
|
+// eOrderRequestData.setCustomerName("爱贝源");
|
|
|
+// eOrderRequestData.setCustomerPwd("Iamberry321.");
|
|
|
+// eOrderRequestData.setSendSite("广东东莞公司");
|
|
|
+ eOrderRequestData.setCustomerName("teststo");
|
|
|
+ eOrderRequestData.setCustomerPwd("teststopwd");
|
|
|
+ eOrderRequestData.setSendSite("teststosendsite");
|
|
|
} else if (post.equalsIgnoreCase("DBL")) {
|
|
|
eOrderRequestData.setCustomerName("月结编码");
|
|
|
}
|
|
@@ -256,7 +261,7 @@ public class AwaitSendController {
|
|
|
}
|
|
|
Goodsquantity += temp.getItemNum();
|
|
|
}
|
|
|
- String uuid = UUIDGenerator.getUUID();
|
|
|
+ String uuid = UUIDGenerator.getUUID().substring(0, 10);
|
|
|
Map<String, Object> product1 = new HashMap<String, Object>();
|
|
|
product1.put("GoodsName", uuid);
|
|
|
product1.put("Goodsquantity", Goodsquantity);
|