|
|
@@ -15,6 +15,7 @@ import com.iamberry.rst.utils.StitchAttrUtil;
|
|
|
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 org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
@@ -247,8 +248,9 @@ public class AwaitSendController {
|
|
|
for (SalesOrderItem temp : items) {
|
|
|
goodName += temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum() + ";";
|
|
|
}
|
|
|
+ String uuid = UUIDGenerator.getUUID();
|
|
|
Map<String, Object> product1 = new HashMap<String, Object>();
|
|
|
- product1.put("GoodsName", goodName);
|
|
|
+ product1.put("GoodsName", uuid);
|
|
|
// 计算产品重量
|
|
|
product1.put("GoodsWeight", 1.0);
|
|
|
Commodity.add(product1);
|
|
|
@@ -263,6 +265,8 @@ public class AwaitSendController {
|
|
|
JSONObject jsonObject = JSONObject.parseObject(json);
|
|
|
boolean flag = jsonObject.getBoolean("Success");
|
|
|
if (flag) {
|
|
|
+ // 替换产品名称
|
|
|
+ json = json.replace(uuid, goodName);
|
|
|
// 获取电子面单成功
|
|
|
String code = jsonObject.getJSONObject("Order").getString("LogisticCode");
|
|
|
// 订单发货
|
