elf
/
honor-dd-light-ds-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yh

Browse Source
20230922-ljl-fixBug
ljl 1 year ago
parent cc520ab5ee
commit 23188d7d85
9 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
ms-api/src/main/java/com/ms/api/dto/dsapi/response/DsErrorRetDTO.java
Unescape Escape View File

@ -4,6 +4,8 @@ import lombok.Data;
@Data
public class DsErrorRetDTO {
private Integer isEncryptOrder;
private Integer isSupportEncryptOrder;
private String platformOrderId;
private String[] platformSkuIds;
private String result;

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

@ -89,6 +89,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
@Autowired
private PurchaseOrderTagService purchaseOrderTagService;
@Autowired
private PurchaseOrderDsEncryptService purchaseOrderDsEncryptService;
@Override
public BatchCreateDistributionOrdersResponseDTO batchCreateDistributionOrders(Long shopId, BatchCreateDistributionOrdersRequestDTO request) {
List<PlatformOrderDTO> platformOrders = request.getPlatformOrders();
@ -355,6 +358,31 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
}
}
private void saveErrorPurchaseOrderDsEncrypt(BatchCreateDistributionOrdersResponseDTO response) {
List<PurchaseOrderDsEncrypt> logs = new ArrayList<>();
for (DsErrorRetDTO errorItem: response.getErrorList()) {
if (errorItem.getIsEncryptOrder() < 1) {
continue;
}
PurchaseOrderDsEncrypt log = new PurchaseOrderDsEncrypt();
log.setShopId();
log.setOrderId(errorItem.getPlatformOrderId());
log.setIsEncryptOrder(errorItem.getIsEncryptOrder());
log.setIsSupportEncryptOrder(errorItem.getIsSupportEncryptOrder());
log.setPurchaseOrderSn(null);
log.setResult(errorItem.getResult());
log.setReason(errorItem.getReason());
log.setGmtCreate(new Date());
log.setGmtModified(new Date());
logs.add(log);
}
// purchaseOrderDsEncryptService.batchInsert();
}
private void processCreateDsOrderFailure(BatchCreateDistributionOrdersResponseDTO response) {
}
private void dsRelatePurchaseOrder(PurchaseOrderRequestDTO purchaseOrderInfo, OpOrder opOrder) {
PurchaseOrder purchaseOrder = purchaseOrderService.getByPlatformAndPurchaseOrderSn(purchaseOrderInfo.getPurchasePlatform(), purchaseOrderInfo.getPurchaseOrderSn());
List<OpOrderChild> children = opOrderChildService.getListByOrderId(opOrder.getOrderId());

5
ms-biz/src/main/java/com/ms/api/service/impl/DsApiServiceImpl.java
Unescape Escape View File

@ -38,8 +38,9 @@ public class DsApiServiceImpl implements DsApiService {
item.setPlatformItemId(SecurityTool.encodeByAES(item.getPlatformItemId()));
}
}
// String resp = execute("/order/batchCreateDistributionOrders", objectToMap(request));
String resp = "{\"result\":\"success\",\"successCount\":1,\"failCount\":0,\"successList\":[{\"result\":\"success\",\"data\":{\"success\":true,\"totalSuccessAmount\":6500,\"orderId\":\"3507894290302847640\",\"postFee\":1500,\"mutilOrders\":null},\"createAlibabaOrderLogId\":960,\"platformOrderIds\":[\"6921501275308365608\"],\"isEncryptOrder\":1,\"isSupportEncryptOrder\":1,\"isUseManualConsignee\":0,\"flow\":\"fenxiao\",\"includeSplitJxhy\":false,\"sourceOrderIds\":[\"3507894290302847640\"],\"payRet\":{\"3507894290302847640\":{\"result\":\"fail\",\"code\":\"NO_SIGN_UP_ERROR\",\"reason\":\"\\u672a\\u7b7e\\u7ea6\\u6216\\u672a\\u7ed1\\u5b9a\"}},\"platformOrderId\":\"6921501275308365608\",\"relatePurchaseOrderInfos\":[{\"platformOrderId\":\"6921501275308365608\",\"purchasePlatform\":\"1688DS\",\"purchaseOrderSn\":\"3507894290302847640\",\"purchaseOrderBuyer\":\"goufx_ms\",\"purchaseOrderSeller\":\"\\u798f\\u5dde\\u67cf\\u4e3a\\u5546\\u8d38\\u6709\\u9650\\u516c\\u53f8\",\"purchaseOrderPayment\":\"65\",\"purchaseOrderFullname\":\"\\u53f6*\",\"purchaseOrderMobile\":\"1********51\",\"purchaseOrderFullAddress\":\"\\u7518\\u8083\\u7701 \\u5609\\u5cea\\u5173\\u5e02 \\u94a2\\u57ce\\u8857\\u9053 \\u8fce\\u5bbe*\\u8def****-*\\u53f7****\",\"purchaseOrderStartTime\":\"2023-09-05 16:57:29\",\"platformPushStatus\":\"wait\",\"purchaseOrderLogisticsName\":\"\",\"purchaseOrderWaybillCode\":\"\",\"purchaseOrderStatus\":\"wait_pay\",\"purchaseOrderFlow\":\"fenxiao\",\"alibabaOrderStatus\":\"waitbuyerpay\",\"isUseManualConsignee\":0,\"isDsEncryptOrder\":\"1\",\"isSupportEncryptOrder\":\"1\",\"logisticsIsAccept\":false,\"items\":[{\"skuId\":\"1759603409502271\",\"wareId\":\"3603667784447454901\",\"purchaseNum\":\"1\",\"purchasePrice\":\"50\",\"sourceItemId\":\"714710164290\"}],\"mergePurchasePlatformOrderIds\":null}]}],\"errorList\":null,\"lockSourceItems\":[{\"createPurchaseOrderLockSkuId\":\"1432\",\"createPurchaseOrderLockId\":\"20000973\",\"sourceItemId\":\"714710164290\",\"sourceSkuId\":\"5255522619991\",\"createPurchaseOrderLogId\":\"1017\",\"sourceOrderId\":\"3507894290302847640\",\"sourceNum\":null,\"reqId\":null,\"status\":\"lock\",\"gmtCreate\":\"2023-09-05 16:57:28\",\"gmtModified\":\"2023-09-05 16:57:29\",\"platformOrderId\":\"6921501275308365608\",\"platformItemId\":\"3603667784447454901\",\"platformSkuId\":\"1759603409502271\"}]}";
String resp = execute("/order/batchCreateDistributionOrders", objectToMap(request));
// String resp = "{\"result\":\"success\",\"successCount\":1,\"failCount\":0,\"successList\":[{\"result\":\"success\",\"data\":{\"success\":true,\"totalSuccessAmount\":6500,\"orderId\":\"3507894290302847640\",\"postFee\":1500,\"mutilOrders\":null},\"createAlibabaOrderLogId\":960,\"platformOrderIds\":[\"6921501275308365608\"],\"isEncryptOrder\":1,\"isSupportEncryptOrder\":1,\"isUseManualConsignee\":0,\"flow\":\"fenxiao\",\"includeSplitJxhy\":false,\"sourceOrderIds\":[\"3507894290302847640\"],\"payRet\":{\"3507894290302847640\":{\"result\":\"fail\",\"code\":\"NO_SIGN_UP_ERROR\",\"reason\":\"\\u672a\\u7b7e\\u7ea6\\u6216\\u672a\\u7ed1\\u5b9a\"}},\"platformOrderId\":\"6921501275308365608\",\"relatePurchaseOrderInfos\":[{\"platformOrderId\":\"6921501275308365608\",\"purchasePlatform\":\"1688DS\",\"purchaseOrderSn\":\"3507894290302847640\",\"purchaseOrderBuyer\":\"goufx_ms\",\"purchaseOrderSeller\":\"\\u798f\\u5dde\\u67cf\\u4e3a\\u5546\\u8d38\\u6709\\u9650\\u516c\\u53f8\",\"purchaseOrderPayment\":\"65\",\"purchaseOrderFullname\":\"\\u53f6*\",\"purchaseOrderMobile\":\"1********51\",\"purchaseOrderFullAddress\":\"\\u7518\\u8083\\u7701 \\u5609\\u5cea\\u5173\\u5e02 \\u94a2\\u57ce\\u8857\\u9053 \\u8fce\\u5bbe*\\u8def****-*\\u53f7****\",\"purchaseOrderStartTime\":\"2023-09-05 16:57:29\",\"platformPushStatus\":\"wait\",\"purchaseOrderLogisticsName\":\"\",\"purchaseOrderWaybillCode\":\"\",\"purchaseOrderStatus\":\"wait_pay\",\"purchaseOrderFlow\":\"fenxiao\",\"alibabaOrderStatus\":\"waitbuyerpay\",\"isUseManualConsignee\":0,\"isDsEncryptOrder\":\"1\",\"isSupportEncryptOrder\":\"1\",\"logisticsIsAccept\":false,\"items\":[{\"skuId\":\"1759603409502271\",\"wareId\":\"3603667784447454901\",\"purchaseNum\":\"1\",\"purchasePrice\":\"50\",\"sourceItemId\":\"714710164290\"}],\"mergePurchasePlatformOrderIds\":null}]}],\"errorList\":null,\"lockSourceItems\":[{\"createPurchaseOrderLockSkuId\":\"1432\",\"createPurchaseOrderLockId\":\"20000973\",\"sourceItemId\":\"714710164290\",\"sourceSkuId\":\"5255522619991\",\"createPurchaseOrderLogId\":\"1017\",\"sourceOrderId\":\"3507894290302847640\",\"sourceNum\":null,\"reqId\":null,\"status\":\"lock\",\"gmtCreate\":\"2023-09-05 16:57:28\",\"gmtModified\":\"2023-09-05 16:57:29\",\"platformOrderId\":\"6921501275308365608\",\"platformItemId\":\"3603667784447454901\",\"platformSkuId\":\"1759603409502271\"}]}";
// String resp = "{\"result\":\"success\",\"successCount\":1,\"failCount\":0,\"successList\":[{\"result\":\"success\",\"data\":{\"success\":true,\"totalSuccessAmount\":6500,\"orderId\":\"3510731197203847640\",\"postFee\":1500,\"mutilOrders\":null},\"createAlibabaOrderLogId\":965,\"platformOrderIds\":[\"6921501275308365608\"],\"isEncryptOrder\":1,\"isSupportEncryptOrder\":1,\"isUseManualConsignee\":0,\"flow\":\"fenxiao\",\"includeSplitJxhy\":false,\"sourceOrderIds\":[\"3510731197203847640\"],\"payRet\":{\"3510731197203847640\":{\"result\":\"fail\",\"code\":\"NO_SIGN_UP_ERROR\",\"reason\":\"\\u672a\\u7b7e\\u7ea6\\u6216\\u672a\\u7ed1\\u5b9a\"}},\"platformOrderId\":\"6921501275308365608\",\"relatePurchaseOrderInfos\":[{\"platformOrderId\":\"6921501275308365608\",\"purchasePlatform\":\"1688DS\",\"purchaseOrderSn\":\"3510731197203847640\",\"purchaseOrderBuyer\":\"goufx_ms\",\"purchaseOrderSeller\":\"\\u798f\\u5dde\\u67cf\\u4e3a\\u5546\\u8d38\\u6709\\u9650\\u516c\\u53f8\",\"purchaseOrderPayment\":\"65\",\"purchaseOrderFullname\":\"\\u53f6*\",\"purchaseOrderMobile\":\"1********51\",\"purchaseOrderFullAddress\":\"\\u7518\\u8083\\u7701 \\u5609\\u5cea\\u5173\\u5e02 \\u94a2\\u57ce\\u8857\\u9053 \\u8fce\\u5bbe*\\u8def****-*\\u53f7****\",\"purchaseOrderStartTime\":\"2023-09-07 09:50:55\",\"platformPushStatus\":\"wait\",\"purchaseOrderLogisticsName\":\"\",\"purchaseOrderWaybillCode\":\"\",\"purchaseOrderStatus\":\"wait_pay\",\"purchaseOrderFlow\":\"fenxiao\",\"alibabaOrderStatus\":\"waitbuyerpay\",\"isUseManualConsignee\":0,\"isDsEncryptOrder\":\"1\",\"isSupportEncryptOrder\":\"1\",\"logisticsIsAccept\":false,\"items\":[{\"skuId\":\"1759603409502271\",\"wareId\":\"3603667784447454901\",\"purchaseNum\":\"1\",\"purchasePrice\":\"50\",\"sourceItemId\":\"714710164290\"}],\"mergePurchasePlatformOrderIds\":null}]}],\"errorList\":null,\"lockSourceItems\":[{\"createPurchaseOrderLockSkuId\":\"1439\",\"createPurchaseOrderLockId\":\"20000980\",\"sourceItemId\":\"714710164290\",\"sourceSkuId\":\"5255522619991\",\"createPurchaseOrderLogId\":\"1022\",\"sourceOrderId\":\"3510731197203847640\",\"sourceNum\":null,\"reqId\":null,\"status\":\"lock\",\"gmtCreate\":\"2023-09-07 09:50:54\",\"gmtModified\":\"2023-09-07 09:50:55\",\"platformOrderId\":\"6921501275308365608\",\"platformItemId\":\"3603667784447454901\",\"platformSkuId\":\"1759603409502271\"}]}";
return JSON.parseObject(resp, BatchCreateDistributionOrdersResponseDTO.class);
}

2
ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java
Unescape Escape View File

@ -1566,7 +1566,7 @@ public class OpOrderServiceImpl implements OpOrderService {
param.setIsAddStar(isAddStar ? "true" : "false");
param.setStar("" + star);
}
System.out.println(param);
request.setParam(param);
OrderAddOrderRemarkResponse response = request.execute();
System.out.println(response);
return response.isSuccess();

1
ms-biz/src/main/java/com/ms/api/spi/order/SaveOrderSellerRemarkService.java
Unescape Escape View File

@ -58,6 +58,7 @@ public class SaveOrderSellerRemarkService extends SPIBaseService implements Exte
opOrderService.updateOpOrderSellerRemarkToDb(opOrder.getShopId(), fields.getOrderId(), fields.getRemark(),
fields.getFlag(), true, OrderPrintConst.UPDATE_SELLER_WORD_SOURCE_SINGLE, fields.getRemark());
} catch (RuntimeException exception) {
exception.printStackTrace();
return R.fail(exception.getLocalizedMessage());
}

4
ms-dal/src/main/java/com/ms/dal/entity/PurchaseOrderDsEncrypt.java
Unescape Escape View File

@ -33,12 +33,12 @@ public class PurchaseOrderDsEncrypt implements Serializable {
/**
*
*/
private Boolean isSupportEncryptOrder;
private Integer isSupportEncryptOrder;
/**
*
*/
private Byte isEncryptOrder;
private Integer isEncryptOrder;
/**
*

1
ms-dal/src/main/resources/mapper/OpOrderMapper.xml
Unescape Escape View File

@ -488,6 +488,7 @@
</choose>
</select>
<update id="updateOrderRemark">
update op_order
<set>
<if test="remark != null">
seller_words = #{remark,jdbcType=VARCHAR},

14
ms-dal/src/main/resources/mapper/PurchaseOrderDsEncryptMapper.xml
Unescape Escape View File

@ -9,7 +9,7 @@
<result property="shopId" column="shop_id" jdbcType="BIGINT"/>
<result property="orderId" column="order_id" jdbcType="VARCHAR"/>
<result property="purchaseOrderSn" column="purchase_order_sn" jdbcType="VARCHAR"/>
<result property="isSupportEncryptOrder" column="is_support_encrypt_order" jdbcType="BOOLEAN"/>
<result property="isSupportEncryptOrder" column="is_support_encrypt_order" jdbcType="TINYINT"/>
<result property="isEncryptOrder" column="is_encrypt_order" jdbcType="TINYINT"/>
<result property="result" column="result" jdbcType="VARCHAR"/>
<result property="reason" column="reason" jdbcType="VARCHAR"/>
@ -42,7 +42,7 @@
,result,reason,gmt_create
,gmt_modified)
values (#{purchaseOrderDsEncryptId,jdbcType=BIGINT},#{shopId,jdbcType=BIGINT},#{orderId,jdbcType=VARCHAR}
,#{purchaseOrderSn,jdbcType=VARCHAR},#{isSupportEncryptOrder,jdbcType=BOOLEAN},#{isEncryptOrder,jdbcType=TINYINT}
,#{purchaseOrderSn,jdbcType=VARCHAR},#{isSupportEncryptOrder,jdbcType=TINYINT},#{isEncryptOrder,jdbcType=TINYINT}
,#{result,jdbcType=VARCHAR},#{reason,jdbcType=VARCHAR},#{gmtCreate,jdbcType=TIMESTAMP}
,#{gmtModified,jdbcType=TIMESTAMP})
</insert>
@ -54,11 +54,11 @@
,result,reason,gmt_create
,gmt_modified)
values (#{purchaseOrderDsEncryptId,jdbcType=BIGINT},#{shopId,jdbcType=BIGINT},#{orderId,jdbcType=VARCHAR}
,#{purchaseOrderSn,jdbcType=VARCHAR},#{isSupportEncryptOrder,jdbcType=BOOLEAN},#{isEncryptOrder,jdbcType=TINYINT}
,#{purchaseOrderSn,jdbcType=VARCHAR},#{isSupportEncryptOrder,jdbcType=TINYINT},#{isEncryptOrder,jdbcType=TINYINT}
,#{result,jdbcType=VARCHAR},#{reason,jdbcType=VARCHAR},#{gmtCreate,jdbcType=TIMESTAMP}
,#{gmtModified,jdbcType=TIMESTAMP})
ON DUPLICATE KEY UPDATE
shop_id = #{shopId,jdbcType=BIGINT}, order_id = #{orderId,jdbcType=VARCHAR}, purchase_order_sn = #{purchaseOrderSn,jdbcType=VARCHAR}, is_support_encrypt_order = #{isSupportEncryptOrder,jdbcType=BOOLEAN}, is_encrypt_order = #{isEncryptOrder,jdbcType=TINYINT}, result = #{result,jdbcType=VARCHAR}, reason = #{reason,jdbcType=VARCHAR}, gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}
shop_id = #{shopId,jdbcType=BIGINT}, order_id = #{orderId,jdbcType=VARCHAR}, purchase_order_sn = #{purchaseOrderSn,jdbcType=VARCHAR}, is_support_encrypt_order = #{isSupportEncryptOrder,jdbcType=TINYINT}, is_encrypt_order = #{isEncryptOrder,jdbcType=TINYINT}, result = #{result,jdbcType=VARCHAR}, reason = #{reason,jdbcType=VARCHAR}, gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}
</update>
<insert id="insertSelective" keyColumn="purchase_order_ds_encrypt_id" keyProperty="purchaseOrderDsEncryptId" parameterType="com.ms.dal.entity.PurchaseOrderDsEncrypt" useGeneratedKeys="true">
insert into purchase_order_ds_encrypt
@ -79,7 +79,7 @@
<if test="shopId != null">#{shopId,jdbcType=BIGINT},</if>
<if test="orderId != null">#{orderId,jdbcType=VARCHAR},</if>
<if test="purchaseOrderSn != null">#{purchaseOrderSn,jdbcType=VARCHAR},</if>
<if test="isSupportEncryptOrder != null">#{isSupportEncryptOrder,jdbcType=BOOLEAN},</if>
<if test="isSupportEncryptOrder != null">#{isSupportEncryptOrder,jdbcType=TINYINT},</if>
<if test="isEncryptOrder != null">#{isEncryptOrder,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=VARCHAR},</if>
<if test="reason != null">#{reason,jdbcType=VARCHAR},</if>
@ -100,7 +100,7 @@
purchase_order_sn = #{purchaseOrderSn,jdbcType=VARCHAR},
</if>
<if test="isSupportEncryptOrder != null">
is_support_encrypt_order = #{isSupportEncryptOrder,jdbcType=BOOLEAN},
is_support_encrypt_order = #{isSupportEncryptOrder,jdbcType=TINYINT},
</if>
<if test="isEncryptOrder != null">
is_encrypt_order = #{isEncryptOrder,jdbcType=TINYINT},
@ -126,7 +126,7 @@
shop_id = #{shopId,jdbcType=BIGINT},
order_id = #{orderId,jdbcType=VARCHAR},
purchase_order_sn = #{purchaseOrderSn,jdbcType=VARCHAR},
is_support_encrypt_order = #{isSupportEncryptOrder,jdbcType=BOOLEAN},
is_support_encrypt_order = #{isSupportEncryptOrder,jdbcType=TINYINT},
is_encrypt_order = #{isEncryptOrder,jdbcType=TINYINT},
result = #{result,jdbcType=VARCHAR},
reason = #{reason,jdbcType=VARCHAR},

2
ms-dal/src/main/resources/mapper/PurchaseOrderItemMapper.xml
Unescape Escape View File

@ -45,7 +45,7 @@
#{item}
</foreach>
</if>
and status = #{status}
<if test="status != null">and status = #{status}</if>
</select>
<select id="getSkuIdsByOrderId" resultType="com.ms.dal.entity.PurchaseOrderItem">
select

Write Preview
Loading…
Cancel
Save