elf
/
honor-dd-supply-center
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
20240115-ljl-multiPay
ljl 1 year ago
parent dd5e82305a
commit 7cd81c8533
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File

8
ms-api/src/main/java/com/ms/api/dto/dsapi/request/ConsigneeInfoDTO.java
Unescape Escape View File

@ -10,13 +10,13 @@ public class ConsigneeInfoDTO {
private String fullname;
private String telephone;
private String mobile;
private Integer provinceAreaId;
private String provinceAreaId;
private String province;
private Integer cityAreaId;
private String cityAreaId;
private String city;
private Integer countyAreaId;
private String countyAreaId;
private String county;
private Integer townAreaId;
private String townAreaId;
private String town;
private String address;
private String fullAddress;

7
ms-biz/src/main/java/com/ms/biz/dto/openspi/request/Address.java
Unescape Escape View File

@ -15,9 +15,16 @@ public class Address {
private Area street;
@SerializedName("encrypt_post_tel")
private String encryptPostTel;
@SerializedName("encrypt_post_receiver")
private String encryptPostReceiver;
@SerializedName("encrypt_detail")
private String encryptDetail;
@SerializedName("detail")
private String detail;
@SerializedName("post_tel")

12
ms-biz/src/main/java/com/ms/biz/service/impl/DistributionOrderServiceImpl.java
Unescape Escape View File

@ -342,13 +342,13 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
ConsigneeInfoDTO consigneeInfo = new ConsigneeInfoDTO();
consigneeInfo.setAddress(address.getDetail());
consigneeInfo.setProvince(address.getProvince().getName());
consigneeInfo.setProvinceAreaId(Integer.valueOf(address.getProvince().getId()));
consigneeInfo.setProvinceAreaId(address.getProvince().getId());
consigneeInfo.setCity(address.getCity().getName());
consigneeInfo.setCityAreaId(Integer.valueOf(address.getCity().getId()));
consigneeInfo.setCityAreaId(address.getCity().getId());
consigneeInfo.setCounty(address.getTown().getName());
consigneeInfo.setCountyAreaId(Integer.valueOf(address.getTown().getId()));
consigneeInfo.setCountyAreaId(address.getTown().getId());
consigneeInfo.setTown(address.getStreet().getName());
consigneeInfo.setTownAreaId(Integer.valueOf(address.getStreet().getId()));
consigneeInfo.setTownAreaId(address.getStreet().getId());
consigneeInfo.setFullname(address.getPostReceiver());
consigneeInfo.setMobile(address.getPostTel());
@ -362,8 +362,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
encryptOutOrderInfo.setEncryptOrder(true);
encryptOutOrderInfo.setOutPlatformOrderNo(orderId);
encryptOutOrderInfo.setOutPlatformCode("douyin");
encryptOutOrderInfo.setEncryptReceiverName(address.getPostReceiver());
encryptOutOrderInfo.setEncryptReceiverMobile(address.getPostTel());
encryptOutOrderInfo.setEncryptReceiverName(address.getEncryptPostReceiver());
encryptOutOrderInfo.setEncryptReceiverMobile(address.getEncryptPostTel());
encryptOutOrderInfo.setEncryptReceiverAddress(address.getEncryptDetail());
return encryptOutOrderInfo;
}

3
ms-web/src/main/java/com/ms/web/controller/Test.java
Unescape Escape View File

@ -228,10 +228,11 @@ public class Test {
@RequestMapping("/batchCreate")
public String batchCreate() {
String d = "{\"orders\":[{\"pur_order_id\":\"7299756498531418412\",\"order_id\":\"6917543139367389081\",\"post_address\":{\"province\":{\"id\":\"11\",\"name\":\"北京市\"},\"city\":{\"id\":\"110000\",\"name\":\"北京市\"},\"town\":{\"id\":\"110108\",\"name\":\"海淀区\"},\"street\":{\"id\":\"110108012\",\"name\":\"海淀街道\"},\"encrypt_detail\":\"MC8EEAjx7GdmeypB6WkV9DrpH9sEGWv8lSI1N1i9SaxcxKw1aW4waq481ueqVRcEAA==\",\"post_tel\":\"MCEEEDyPE4U3H7NDrnVhSgGOPzsEC9mVHEzJYMyY91uJBAA=\",\"post_receiver\":\"MCgEEHlttu0OuRqxJ3AaFAEvpr8EEjMU+9kRHPkU+MiXyD4zIkdVMgQA\"},\"mask_post_address\":{\"province\":{\"id\":\"11\",\"name\":\"北京市\"},\"city\":{\"id\":\"110000\",\"name\":\"北京市\"},\"town\":{\"id\":\"110108\",\"name\":\"海淀区\"},\"street\":{\"id\":\"110108012\",\"name\":\"海淀街道\"},\"detail\":\"互联*******\",\"post_tel\":\"1********00\",\"post_receiver\":\"电*****\"},\"sku_orders\":[{\"pur_sku_order_id\":\"7299756498531451180\",\"sku_order_id\":\"6917543139367389081\",\"cargo_id\":3649687424122130945,\"cargo_sku_id\":3659175936152832,\"product_id\":3649883085652281308,\"sku_id\":3659175955997568,\"num\":1,\"outer_product_id\":\"686872273204\",\"outer_sku_id\":\"4897420288982\"}]}],\"shop_id\":1111502210}";
String d = "{\"orders\":[{\"mask_post_address\":{\"city\":{\"id\":\"330100\",\"name\":\"杭州市\"},\"detail\":\"余杭*路****\",\"post_receiver\":\"淡**\",\"post_tel\":\"1********80\",\"province\":{\"id\":\"33\",\"name\":\"浙江省\"},\"street\":{\"id\":\"3301100120000\",\"name\":\"仓前街道\"},\"town\":{\"id\":\"3301100000000\",\"name\":\"余杭区\"}},\"order_id\":\"6923840578763953515\",\"post_address\":{\"city\":{\"id\":\"330100\",\"name\":\"杭州市\"},\"detail\":\"\",\"encrypt_detail\":\"#iyvDRxlWwsSVIGFpTvXG8xnTMrr4#ACn6LHQE1kb+TbI85Ka6e+LQtjO1AxrT6bcTCtHDD9oG1RtU8x9aw73EeIyImArqzGAqcIl5tY6xfSKMGsekZO172jS0n3XADmslrLL32Qu17LnmrgcVXvJSt2b2DcHS*CgwIARCtHBiqICABKAESPgo8pbS3syRmunaGXTFmXXljtG2r/f16AS6WqXmIcsJqFpPayW+paVDmQbq2cqdfytcxhv1RKo3+7sWiggBCGgA=#1##\",\"encrypt_post_receiver\":\"#smlyjYrQ#IfMCin8hRw96KQwfgDAQGWltM7lRF1Y5IWHGR6fztU2wbG81dpHmbC7knpQKTZAVnymCzDSXPs/o0tPKiIWqkwtcXoJ8CGoHlCq8RyNbQJ24*CgwIARCtHBiqICABKAESPgo8YTCpI69Am/cxRo6MK2mA2aInfozU8iNlnLLTkDrARyWtyPk2jQHXBVfMvF46PZ2hLYwiCq/EKi0Ou89/GgA=#1##\",\"encrypt_post_tel\":\"$o+GrGJidM5c0VEWIKPfzwjrgJJvnyAnBCrKy42/Puig=$sJViW2c/NlJulTEuRZJkVeH+J3sgxlIkklQg3lYwYcvLgmecRz+v4f8N43+yPZa7BNew4SmxGK+N0ybzlo2xKlELi20Norw0WRq67Tu6fdb6OGc=*CgwIARCtHBiqICABKAESPgo8jUy6fINer40wH26e6Ojh22NOyPXaWv9uapVIKVu39QNXdsbC/JscSv4xcSlcbyR1zVbPRPe+vcoisAqgGgA=$1$$\",\"post_receiver\":\"\",\"post_tel\":\"\",\"province\":{\"id\":\"33\",\"name\":\"浙江省\"},\"street\":{\"id\":\"3301100120000\",\"name\":\"仓前街道\"},\"town\":{\"id\":\"3301100000000\",\"name\":\"余杭区\"}},\"pur_order_id\":\"7302285414677152035\",\"sku_orders\":[{\"cargo_id\":3650987455676581230,\"cargo_sku_id\":3385720331553538,\"num\":1,\"outer_product_id\":\"649016281205\",\"outer_sku_id\":\"4823756953234\",\"product_id\":3651167138015801592,\"pur_sku_order_id\":\"7302285414677168419\",\"sku_id\":3385747071915266,\"sku_order_id\":\"6923840578763953515\"}]}],\"shop_id\":117233105}";
BatchCreateParam param = JSON.parseObject(d, BatchCreateParam.class);
BatchCreateData data = new BatchCreateData();
distributionOrderService.batchCreate(param, data);
System.out.println(param);
return "";
}

Write Preview
Loading…
Cancel
Save