修改bug,存在赠品的情况会被计算2次

order-application-service/src/main/java/cn/freemud/utils/DemoMain.java

@@ -16,7 +16,7 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoR
  */
 public class DemoMain {
     public static void main(String[] args) {
-        String str = "{\"abnormalDesc\":\"\",\"abnormalState\":0,\"actualPayAmount\":342.0,\"afterSalesOrderList\":[],\"appId\":\"wxa1f272347828dae8\",\"barCounter\":\"\",\"bizType\":1,\"businessDay\":1653235200000,\"canRefund\":true,\"cancelReason\":\"\",\"companySelfCode\":\"\",\"createTime\":1653278540000,\"daySeq\":0,\"deliveryContactInfoList\":[{\"addressDetail\":\"学清嘉创大厦A座,15层\",\"city\":\"\",\"contactsName\":\"\",\"expressNo\":\"0\",\"extInfo\":\"{\\\"receiveId\\\": \\\"3652236942336672686\\\"}\",\"infoType\":1,\"latitude\":40.0149612,\"longitude\":116.353096,\"mobile\":\"18017275431\",\"province\":\"\",\"region\":\"\",\"relateObjectType\":1,\"street\":\"\",\"telephone\":\"\",\"thirdDeliveryId\":\"0\",\"tripDist\":0},{\"addressDetail\":\"third\",\"city\":\"\",\"contactsName\":\"\",\"expressNo\":\"0\",\"extInfo\":\"\",\"infoType\":0,\"latitude\":0.0,\"longitude\":0.0,\"mobile\":\"\",\"province\":\"\",\"region\":\"\",\"relateObjectType\":3,\"street\":\"\",\"telephone\":\"\",\"thirdDeliveryId\":\"0\",\"tripDist\":0}],\"deliveryPromise\":0,\"deliveryState\":-2,\"dinersNumber\":0,\"downstreamPosCode\":\"0\",\"downstreamThirdOrderCode\":\"0\",\"estimateDeliveryCompleteTime\":1653280520000,\"evaluationState\":0,\"expressChannelCode\":\"\",\"expressChannelName\":\"\",\"expressNo\":\"\",\"expressType\":0,\"extInfo\":\"{\\\"sessionKey\\\":\\\"lquUZU3UMNN0keKPDKIw7w==\\\",\\\"openid\\\":\\\"o0wG94vrmHbVDPayTdd_bLAFbAw8\\\",\\\"paidMember\\\":false,\\\"sessionId\\\":\\\"8773c2052cad07db5417a0f22c177d6affea632f\\\",\\\"serviceTime\\\":50,\\\"totalScore\\\":0,\\\"version\\\":\\\"2.0.78.7\\\",\\\"packageAmountCollectType\\\":1,\\\"pushOrderTime\\\":0,\\\"fmId\\\":\\\"437583937070297088\\\",\\\"deliveryHoursDayEnd\\\":\\\"\\\",\\\"fromAppId\\\":\\\"wxa1f272347828dae8\\\",\\\"appid\\\":\\\"wxa1f272347828dae8\\\",\\\"deliveryHoursDayStart\\\":\\\"2022-05-23 00:00:00\\\",\\\"prepayId\\\":\\\"\\\"}\",\"immediately\":true,\"isParent\":false,\"localTableKey\":\"\",\"marketingCode\":\"\",\"marketingType\":0,\"needInvoice\":false,\"note\":\"\",\"operator\":\"\",\"orderArea\":\"0\",\"orderClient\":2,\"orderCode\":\"24456665780210743600003\",\"orderCostDetailList\":[],\"orderExtended\":{\"agentPayerId\":\"\",\"agentPayerName\":\"\",\"createTime\":1653278540000,\"id\":244566657802107436,\"isDeleted\":false,\"orderClientGroup\":\"北京\",\"orderClientGroupCode\":\"beijin\",\"orderCode\":\"24456665780210743600003\",\"orderId\":244566657802107436,\"partnerId\":\"2690\",\"sendWord\":\"\",\"spellGroupCode\":\"\",\"storeId\":\"202104120\",\"storeNameEn\":\"\",\"updateTime\":1653278540000,\"userPhone\":\"\",\"version\":0},\"orderInvoice\":{\"address\":\"\",\"bankCardNo\":\"\",\"content\":\"\",\"invoiceBank\":\"\",\"invoiceNo\":\"\",\"invoiceUrl\":\"\",\"itemId\":\"\",\"partnerId\":\"\",\"phoneNo\":\"\",\"pickUpNo\":\"\",\"taxNo\":\"\",\"title\":\"\",\"userId\":\"\"},\"orderItemList\":[{\"canRefund\":true,\"categoryId\":\"0\",\"categoryName\":\"0\",\"extInfo\":\"{\\\"tax\\\": 0.01, \\\"stapleFood\\\": 0, \\\"isMonthCard\\\": 0, \\\"isSendGoods\\\": false, \\\"cartGoodsUid\\\": \\\"96538187-26b4-4578-a375-34d563e9d60b\\\", \\\"isB3S1Coupon\\\": 0, \\\"spuProductCode\\\": \\\"wefsdf\\\"}\",\"id\":244566657819933230,\"ignoreInOrderClose\":false,\"marketingCode\":\"0\",\"marketingType\":0,\"nickName\":\"\",\"note\":\"\",\"openId\":\"\",\"originalProductType\":2,\"parentProductId\":\"0\",\"photoUrl\":\"\",\"productCode\":\"wefsdf\",\"productForeignName\":\"\",\"productForeignProperty\":\"\",\"productForeignSpecName\":\"\",\"productId\":\"232562948867890490\",\"productName\":\"molly美式\",\"productPicUrl\":\"https://picture.sandload.cn/1644545749037.jpg\",\"productPrice\":171.0,\"productProperty\":\"\",\"productQuantity\":2,\"productSeq\":1,\"productSharePrice\":0.0,\"productSpec\":\"232562948867890490\",\"productSpecName\":\"molly美式\",\"productType\":88,\"productUnit\":\"gk\",\"productUpc\":\"\",\"productWeightUnit\":0,\"salePrice\":171.0,\"settlementPrice\":342.0,\"thirdProductId\":\"wesdsd\",\"userId\":\"\",\"weight\":301.67},{\"canRefund\":true,\"categoryId\":\"0\",\"categoryName\":\"0\",\"extInfo\":\"{\\\"tax\\\": 0, \\\"stapleFood\\\": 0, \\\"isMonthCard\\\": 0, \\\"isB3S1Coupon\\\": 0}\",\"id\":244566657827273264,\"ignoreInOrderClose\":false,\"marketingCode\":\"0\",\"marketingType\":0,\"nickName\":\"\",\"note\":\"\",\"openId\":\"\",\"originalProductType\":2,\"parentProductId\":\"232562948867890490_1\",\"photoUrl\":\"\",\"productCode\":\"\",\"productForeignName\":\"\",\"productForeignProperty\":\"\",\"productForeignSpecName\":\"\",\"productId\":\"215806159829964858\",\"productName\":\"加珍珠\",\"productPicUrl\":\"\",\"productPrice\":11.0,\"productProperty\":\"\",\"productQuantity\":2,\"productSeq\":2,\"productSharePrice\":0.0,\"productSpec\":\"215806159829964858\",\"productSpecName\":\"加珍珠\",\"productType\":0,\"productUnit\":\"\",\"productUpc\":\"\",\"productWeightUnit\":0,\"salePrice\":11.0,\"settlementPrice\":22.0,\"thirdProductId\":\"H00301\",\"userId\":\"\",\"weight\":0.0},{\"canRefund\":true,\"categoryId\":\"0\",\"categoryName\":\"0\",\"extInfo\":\"{\\\"tax\\\": 0, \\\"stapleFood\\\": 0, \\\"isMonthCard\\\": 0, \\\"isSendGoods\\\": true, \\\"cartGoodsUid\\\": \\\"bff3c5c3-e4b5-44c7-89b0-6d3804ce68f0\\\", \\\"isB3S1Coupon\\\": 0, \\\"spuProductCode\\\": \\\"wefsdf\\\", \\\"originalGoodsUid\\\": \\\"96538187-26b4-4578-a375-34d563e9d60b\\\"}\",\"id\":244566657834613298,\"ignoreInOrderClose\":false,\"marketingCode\":\"0\",\"marketingType\":0,\"nickName\":\"\",\"note\":\"\",\"openId\":\"\",\"originalProductType\":0,\"parentProductId\":\"0\",\"photoUrl\":\"\",\"productCode\":\"wefsdf\",\"productForeignName\":\"\",\"productForeignProperty\":\"\",\"productForeignSpecName\":\"\",\"productId\":\"232562948867890490\",\"productName\":\"molly美式\",\"productPicUrl\":\"https://picture.sandload.cn/1644545749037.jpg\",\"productPrice\":160.0,\"productProperty\":\"\",\"productQuantity\":1,\"productSeq\":3,\"productSharePrice\":160.0,\"productSpec\":\"232562948867890490\",\"productSpecName\":\"molly美式\",\"productType\":0,\"productUnit\":\"gk\",\"productUpc\":\"\",\"productWeightUnit\":0,\"salePrice\":0.0,\"settlementPrice\":0.0,\"thirdProductId\":\"wesdsd\",\"userId\":\"\",\"weight\":301.67}],\"orderPayItemCreateReqList\":[{\"cardCode\":\"5826900000011930004\",\"fmTradeNo\":\"7702690244566658197401190\",\"id\":244566658416572988,\"operator\":\"\",\"orderCode\":\"24456665780210743600003\",\"orderId\":244566657802107436,\"outOrderNo\":\"\",\"partnerId\":\"2690\",\"payAmount\":342,\"payChannelName\":\"储值卡\",\"payChannelType\":\"3\",\"storeId\":\"202104120\",\"transId\":\"437583937070297088\"}],\"orderSendCouponRespList\":[],\"orderSettlementDetailList\":[{\"agentDiscountAmount\":0.0,\"carrierDiscountAmount\":0.0,\"extInfo\":\"\",\"externalObjectId\":\"PBMSN2022052312000245465\",\"externalObjectName\":\"\",\"externalObjectSubId\":\"\",\"ignoreInDiscountAmount\":false,\"isOnline\":true,\"note\":\"molly美式\",\"number\":1,\"platformDiscountAmount\":0.0,\"platformServiceAmount\":0.0,\"productId\":\"0\",\"productSeq\":0,\"prospectiveAmount\":0.0,\"settlementAmount\":-160.0,\"settlementType\":23,\"shopAmount\":0.0,\"shopDiscountAmount\":-160.0},{\"agentDiscountAmount\":0.0,\"carrierDiscountAmount\":0.0,\"extInfo\":\"\",\"externalObjectId\":\"PBMSN2022052312000245465\",\"externalObjectName\":\"\",\"externalObjectSubId\":\"\",\"ignoreInDiscountAmount\":false,\"isOnline\":true,\"note\":\"molly美式\",\"number\":1,\"platformDiscountAmount\":0.0,\"platformServiceAmount\":0.0,\"productId\":\"232562948867890490\",\"productSeq\":3,\"prospectiveAmount\":0.0,\"settlementAmount\":160.0,\"settlementType\":23,\"shopAmount\":0.0,\"shopDiscountAmount\":160.0},{\"agentDiscountAmount\":0.0,\"carrierDiscountAmount\":0.0,\"extInfo\":\"\",\"externalObjectId\":\"\",\"externalObjectName\":\"\",\"externalObjectSubId\":\"\",\"ignoreInDiscountAmount\":false,\"isOnline\":true,\"note\":\"\",\"number\":1,\"platformDiscountAmount\":0.0,\"platformServiceAmount\":0.0,\"productId\":\"232562948867890490\",\"productSeq\":3,\"prospectiveAmount\":0.0,\"settlementAmount\":160.0,\"settlementType\":0,\"shopAmount\":0.0,\"shopDiscountAmount\":160.0},{\"agentDiscountAmount\":0.0,\"carrierDiscountAmount\":0.0,\"extInfo\":\"\",\"externalObjectId\":\"\",\"externalObjectName\":\"优惠总金额\",\"externalObjectSubId\":\"\",\"ignoreInDiscountAmount\":false,\"isOnline\":true,\"note\":\"\",\"number\":0,\"platformDiscountAmount\":0.0,\"platformServiceAmount\":0.0,\"productId\":\"0\",\"productSeq\":0,\"prospectiveAmount\":0.0,\"settlementAmount\":342.0,\"settlementType\":205,\"shopAmount\":0.0,\"shopDiscountAmount\":160.0}],\"orderState\":1,\"orderSubState\":0,\"orderType\":3,\"originalAmount\":502.0,\"parentCode\":\"0\",\"partnerId\":\"2690\",\"partnerName\":\"\",\"payChannel\":\"10102\",\"payChannelName\":\"储值卡\",\"payChannelType\":3,\"payRequestNo\":\"0\",\"payState\":1,\"payType\":1,\"pickUpGoodsNo\":\"\",\"posCode\":\"\",\"posTableKey\":\"\",\"printNum\":0,\"settlementAmount\":342.0,\"sourceType\":0,\"storeId\":\"202104120\",\"storeName\":\"molly的小店\",\"storeUnifyId\":\"0\",\"suspendDesc\":\"\",\"suspendState\":0,\"thirdOrderCode\":\"24456665780210743600003\",\"thirdStoreId\":\"202104120\",\"toStoreId\":\"0\",\"updateTime\":1653278540000,\"userId\":\"3649418880733072423\",\"userName\":\"顺丰同城\",\"weight\":905.01}";
+        String str = "{\"abnormalDesc\":\"\",\"abnormalState\":0,\"acceptTime\":\"1653290628000\",\"actualPayAmount\":0.0,\"afterSalesOrderList\":[],\"appId\":\"wxa1f272347828dae8\",\"barCounter\":\"\",\"bizType\":1,\"canRefund\":true,\"cancelReason\":\"\",\"companySelfCode\":\"\",\"createTime\":\"1653290627000\",\"daySeq\":27,\"deliveryContactInfoList\":[{\"addressDetail\":\"学清嘉创大厦A座,15层\",\"city\":\"\",\"contactsName\":\"\",\"expressNo\":\"0\",\"extInfo\":\"{\\\"receiveId\\\": \\\"3652236942336672686\\\"}\",\"infoType\":1,\"latitude\":40.0149612,\"longitude\":116.3530960,\"mobile\":\"18017275431\",\"province\":\"\",\"region\":\"\",\"relateObjectType\":1,\"street\":\"\",\"telephone\":\"\",\"thirdDeliveryId\":\"0\"},{\"addressDetail\":\"third\",\"city\":\"\",\"contactsName\":\"\",\"expressNo\":\"3467201747349554177\",\"extInfo\":\"\",\"infoType\":0,\"latitude\":0E-7,\"longitude\":0E-7,\"mobile\":\"\",\"province\":\"\",\"region\":\"\",\"relateObjectType\":3,\"street\":\"\",\"telephone\":\"\",\"thirdDeliveryId\":\"241714355898605828\"}],\"deliveryPromise\":0,\"deliveryState\":0,\"dinersNumber\":0,\"dispenseStatus\":1,\"downstreamPosCode\":\"0\",\"downstreamThirdOrderCode\":\"0\",\"estimateDeliveryCompleteTime\":\"1653292607000\",\"expressChannelCode\":\"ShunFeng\",\"expressChannelName\":\"顺丰\",\"expressNo\":\"3467201747349554177\",\"expressType\":0,\"extInfo\":\"{\\\"fmId\\\": \\\"437634633098457088\\\", \\\"appid\\\": \\\"wxa1f272347828dae8\\\", \\\"openid\\\": \\\"o0wG94vrmHbVDPayTdd_bLAFbAw8\\\", \\\"payDate\\\": \\\"2022-05-23 15:23:47\\\", \\\"version\\\": \\\"2.0.78.8\\\", \\\"prepayId\\\": \\\"\\\", \\\"fromAppId\\\": \\\"wxa1f272347828dae8\\\", \\\"sessionId\\\": \\\"fa860a199923f2045536e75ec222c5fbde2e5edf\\\", \\\"paidMember\\\": false, \\\"payTransId\\\": \\\"437634633098457088\\\", \\\"sessionKey\\\": \\\"yoQ+nvLqahrbjIYbE0IfMg==\\\", \\\"totalScore\\\": 0, \\\"exceptionId\\\": null, \\\"memberLevel\\\": \\\"星耀77777\\\", \\\"serviceTime\\\": 50, \\\"dispatchType\\\": \\\"0\\\", \\\"exceptionDesc\\\": null, \\\"pushOrderTime\\\": 0, \\\"dispatchTimeout\\\": -1, \\\"deliveryHoursDayEnd\\\": \\\"\\\", \\\"deliveryHoursDayStart\\\": \\\"2022-05-23 00:00:00\\\", \\\"packageAmountCollectType\\\": 1}\",\"immediately\":true,\"isParent\":false,\"localTableKey\":\"\",\"marketingCode\":\"\",\"marketingType\":0,\"needInvoice\":false,\"note\":\"\",\"operator\":\"\",\"orderArea\":\"0\",\"orderClient\":2,\"orderCode\":\"24457933181334179700003\",\"orderCostDetailList\":[],\"orderExtended\":{\"agentPayerId\":\"\",\"agentPayerName\":\"\",\"orderClientGroup\":\"北京\",\"orderClientGroupCode\":\"beijin\",\"sendWord\":\"\",\"spellGroupCode\":\"\",\"storeNameEn\":\"\",\"userPhone\":\"\"},\"orderInvoice\":{\"address\":\"\",\"bankCardNo\":\"\",\"content\":\"\",\"invoiceBank\":\"\",\"invoiceUrl\":\"\",\"itemId\":\"\",\"partnerId\":\"\",\"phoneNo\":\"\",\"taxNo\":\"\",\"title\":\"\"},\"orderItemList\":[{\"canRefund\":true,\"extInfo\":\"{\\\"tax\\\": 0.01, \\\"stapleFood\\\": 0, \\\"isMonthCard\\\": 0, \\\"isSendGoods\\\": false, \\\"cartGoodsUid\\\": \\\"3c1be4ba-ad41-453e-bfd2-11b70dd62363\\\", \\\"isB3S1Coupon\\\": 0, \\\"spuProductCode\\\": \\\"wefsdf\\\"}\",\"id\":244579331839556199,\"ignoreInOrderClose\":false,\"marketingCode\":\"0\",\"marketingType\":0,\"nickName\":\"\",\"note\":\"\",\"openId\":\"\",\"parentProductId\":\"0\",\"photoUrl\":\"\",\"productCode\":\"wefsdf\",\"productForeignName\":\"\",\"productForeignProperty\":\"\",\"productForeignSpecName\":\"\",\"productId\":\"232562948867890490\",\"productName\":\"molly美式\",\"productPicUrl\":\"https://picture.sandload.cn/1644545749037.jpg\",\"productPrice\":171.0,\"productProperty\":\"\",\"productQuantity\":1,\"productSeq\":1,\"productSharePrice\":0.0,\"productSpec\":\"232562948867890490\",\"productSpecName\":\"molly美式\",\"productType\":88,\"productUnit\":\"gk\",\"productUpc\":\"\",\"productWeightUnit\":0,\"salePrice\":171.0,\"settlementPrice\":171.0,\"thirdProductId\":\"wesdsd\",\"userId\":\"\",\"weight\":301.67},{\"canRefund\":true,\"extInfo\":\"{\\\"tax\\\": 0, \\\"stapleFood\\\": 0, \\\"isMonthCard\\\": 0, \\\"isB3S1Coupon\\\": 0}\",\"id\":244579331855284841,\"ignoreInOrderClose\":false,\"marketingCode\":\"0\",\"marketingType\":0,\"nickName\":\"\",\"note\":\"\",\"openId\":\"\",\"parentProductId\":\"232562948867890490_1\",\"photoUrl\":\"\",\"productCode\":\"\",\"productForeignName\":\"\",\"productForeignProperty\":\"\",\"productForeignSpecName\":\"\",\"productId\":\"215806159829964858\",\"productName\":\"加珍珠\",\"productPicUrl\":\"\",\"productPrice\":11.0,\"productProperty\":\"\",\"productQuantity\":1,\"productSeq\":2,\"productSharePrice\":0.0,\"productSpec\":\"215806159829964858\",\"productSpecName\":\"加珍珠\",\"productType\":0,\"productUnit\":\"\",\"productUpc\":\"\",\"productWeightUnit\":0,\"salePrice\":11.0,\"settlementPrice\":11.0,\"thirdProductId\":\"H00301\",\"userId\":\"\",\"weight\":0.00},{\"canRefund\":true,\"extInfo\":\"{\\\"tax\\\": 0, \\\"stapleFood\\\": 0, \\\"isMonthCard\\\": 0, \\\"isSendGoods\\\": true, \\\"cartGoodsUid\\\": \\\"60c018e5-b203-4b48-bb42-a2306030ac4e\\\", \\\"isB3S1Coupon\\\": 0, \\\"spuProductCode\\\": \\\"wefsdf\\\"}\",\"id\":244579331869964907,\"ignoreInOrderClose\":false,\"marketingCode\":\"0\",\"marketingType\":0,\"nickName\":\"\",\"note\":\"\",\"openId\":\"\",\"parentProductId\":\"0\",\"photoUrl\":\"\",\"productCode\":\"wefsdf\",\"productForeignName\":\"\",\"productForeignProperty\":\"\",\"productForeignSpecName\":\"\",\"productId\":\"232562948867890490\",\"productName\":\"molly美式\",\"productPicUrl\":\"https://picture.sandload.cn/1644545749037.jpg\",\"productPrice\":160.0,\"productProperty\":\"\",\"productQuantity\":2,\"productSeq\":3,\"productSharePrice\":160.0,\"productSpec\":\"232562948867890490\",\"productSpecName\":\"molly美式\",\"productType\":0,\"productUnit\":\"gk\",\"productUpc\":\"\",\"productWeightUnit\":0,\"salePrice\":0.0,\"settlementPrice\":0.0,\"thirdProductId\":\"wesdsd\",\"userId\":\"\",\"weight\":301.67}],\"orderOperationHistoryList\":[{\"createTime\":1653290627000,\"operationDesc\":\"订单创建\",\"operationMethod\":\"订单创建\",\"operationType\":1,\"operator\":\"顺丰同城\",\"orderCode\":\"24457933181334179700003\",\"originOrderState\":0,\"partnerId\":\"2690\",\"storeId\":\"202104120\",\"targetOrderState\":1,\"timeout\":30,\"updateTime\":1653290627000,\"updateTimestamp\":1653290627090},{\"createTime\":1653290627000,\"operationDesc\":\"订单待支付变成下单\",\"operationMethod\":\"下单\",\"operationType\":1,\"operator\":\"顺丰同城\",\"orderCode\":\"24457933181334179700003\",\"originOrderState\":1,\"partnerId\":\"2690\",\"storeId\":\"202104120\",\"targetOrderState\":2,\"timeout\":0,\"updateTime\":1653290627000,\"updateTimestamp\":1653290627773},{\"createTime\":1653290627000,\"operationDesc\":\"订单下单变成已接单\",\"operationMethod\":\"已接单\",\"operationType\":1,\"operator\":\"自动任务\",\"orderCode\":\"24457933181334179700003\",\"originOrderState\":2,\"partnerId\":\"2690\",\"storeId\":\"202104120\",\"targetOrderState\":3,\"timeout\":180,\"updateTime\":1653290627000,\"updateTimestamp\":1653290627892},{\"createTime\":1653290628000,\"operationDesc\":\"创建运单成功\",\"operationMethod\":\"创建运单成功\",\"operationType\":1,\"operator\":\"自动任务\",\"orderCode\":\"24457933181334179700003\",\"originOrderState\":0,\"partnerId\":\"2690\",\"storeId\":\"202104120\",\"targetOrderState\":0,\"timeout\":0,\"updateTime\":1653290628000,\"updateTimestamp\":1653290628054},{\"createTime\":1653290628000,\"operationDesc\":\"配送:自动分配成功\",\"operationMethod\":\"配送:自动分配成功\",\"operationType\":1,\"operator\":\"\",\"orderCode\":\"24457933181334179700003\",\"originOrderState\":0,\"partnerId\":\"2690\",\"storeId\":\"202104120\",\"targetOrderState\":0,\"timeout\":0,\"updateTime\":1653290628000,\"updateTimestamp\":1653290628281}],\"orderPayItemCreateReqList\":[{\"cardCode\":\"5826900000011930004\",\"fmTradeNo\":\"7702690244579332198149657\",\"id\":244579332421515893,\"operator\":\"\",\"orderCode\":\"24457933181334179700003\",\"orderId\":244579331813341797,\"outOrderNo\":\"\",\"partnerId\":\"2690\",\"payAmount\":171.0,\"payChannelName\":\"储值卡\",\"payChannelType\":3,\"storeId\":\"202104120\",\"transId\":\"437634633098457088\"}],\"orderSendCouponRespList\":[],\"orderSettlementDetailList\":[{\"agentDiscountAmount\":0,\"carrierDiscountAmount\":0,\"extInfo\":\"\",\"externalObjectId\":\"BNSP2022052315220415326\",\"externalObjectName\":\"\",\"externalObjectSubId\":\"\",\"ignoreInDiscountAmount\":false,\"isOnline\":true,\"note\":\"单规格买赠\",\"number\":1,\"platformDiscountAmount\":0,\"platformServiceAmount\":0,\"productId\":\"0\",\"productSeq\":0,\"prospectiveAmount\":0.0,\"settlementAmount\":-320.0,\"settlementType\":23,\"shopAmount\":0,\"shopDiscountAmount\":-320},{\"agentDiscountAmount\":0,\"carrierDiscountAmount\":0,\"extInfo\":\"\",\"externalObjectId\":\"BNSP2022052315220415326\",\"externalObjectName\":\"\",\"externalObjectSubId\":\"\",\"ignoreInDiscountAmount\":false,\"isOnline\":true,\"note\":\"单规格买赠\",\"number\":2,\"platformDiscountAmount\":0,\"platformServiceAmount\":0,\"productId\":\"232562948867890490\",\"productSeq\":3,\"prospectiveAmount\":0.0,\"settlementAmount\":320.0,\"settlementType\":23,\"shopAmount\":0,\"shopDiscountAmount\":320},{\"agentDiscountAmount\":0,\"carrierDiscountAmount\":0,\"extInfo\":\"\",\"externalObjectId\":\"\",\"externalObjectName\":\"\",\"externalObjectSubId\":\"\",\"ignoreInDiscountAmount\":false,\"isOnline\":true,\"note\":\"\",\"number\":2,\"platformDiscountAmount\":0,\"platformServiceAmount\":0,\"productId\":\"232562948867890490\",\"productSeq\":3,\"prospectiveAmount\":0.0,\"settlementAmount\":320.0,\"settlementType\":0,\"shopAmount\":0,\"shopDiscountAmount\":320},{\"agentDiscountAmount\":0,\"carrierDiscountAmount\":0,\"extInfo\":\"\",\"externalObjectId\":\"\",\"externalObjectName\":\"优惠总金额\",\"externalObjectSubId\":\"\",\"ignoreInDiscountAmount\":false,\"isOnline\":true,\"note\":\"\",\"number\":0,\"platformDiscountAmount\":0,\"platformServiceAmount\":0,\"productId\":\"0\",\"productSeq\":0,\"prospectiveAmount\":0.0,\"settlementAmount\":171.0,\"settlementType\":205,\"shopAmount\":0,\"shopDiscountAmount\":320}],\"orderState\":3,\"orderSubState\":0,\"orderType\":3,\"originalAmount\":491.0,\"parentCode\":\"0\",\"partnerId\":\"2690\",\"partnerName\":\"\",\"payChannel\":\"10102\",\"payChannelName\":\"储值卡\",\"payChannelType\":\"3\",\"payRequestNo\":\"437634633098457088\",\"payState\":2,\"payTime\":\"1653290628000\",\"payType\":1,\"pickUpGoodsNo\":\"4228\",\"posCode\":\"\",\"posTableKey\":\"\",\"printNum\":0,\"settlementAmount\":171.0,\"sourceType\":0,\"storeId\":\"202104120\",\"storeName\":\"molly的小店\",\"storeUnifyId\":\"0\",\"suspendDesc\":\"\",\"suspendState\":0,\"thirdOrderCode\":\"24457933181334179700003\",\"thirdStoreId\":\"202104120\",\"toStoreId\":\"0\",\"updateTime\":\"1653290628000\",\"userId\":\"3649418880733072423\",\"userName\":\"顺丰同城\",\"weight\":905.01}";
         OrderInfoReqs orderInfoReqs = JSON.parseObject(str, OrderInfoReqs.class);
         OrderBeanV1 orderBeanV1 = new OrderCenterSdkAdapter().convent2NEWOrderInfo(orderInfoReqs);
         System.out.println(JSON.toJSONString(orderBeanV1));

order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java

@@ -84,14 +84,15 @@ public class DeliverySdkAdapter {
         }
         BigDecimal result = BigDecimal.ZERO;
         for (ProductBeanV1 p : productList) {
-            if (p.getIsSendGoods()) {
-                continue;
-            }
+//            if (p.getIsSendGoods()) {
+//                continue;
+//            }
             BigDecimal sum = p.getWeight().multiply(new BigDecimal(p.getNumber()));
             BigDecimal comboSum = this.sumWeightByProduct(p.getComboProduct());
             BigDecimal materSum = this.sumWeightByProduct(p.getMaterialProduct());
-            BigDecimal sendSum = this.sumWeightByProduct(p.getSendProduct());
-            result = result.add(sum).add(comboSum).add(materSum).add(sendSum);
+//            BigDecimal sendSum = this.sumWeightByProduct(p.getSendProduct());
+//            result = result.add(sum).add(comboSum).add(materSum).add(sendSum);
+            result = result.add(sum).add(comboSum).add(materSum);
         }
         if (result.compareTo(BigDecimal.ZERO) <= 0) {
             return new BigDecimal("0.5");