mirror of https://github.com/jeecgboot/jeecg-boot
Merge branch 'dev' into feat/clearLogisticChannelName
Gauthier LO
GitHub
commit
a48458baeb
|
|
@ -12,7 +12,7 @@ public class GetFulfillmentRequestBody extends ShopifyRequestBody {
|
|||
|
||||
public GetFulfillmentRequestBody(String sitePrefix, String platformOrderId, String shopToken) {
|
||||
super(sitePrefix, shopToken);
|
||||
this.platformOrderId = platformOrderId;
|
||||
this.platformOrderId = platformOrderId.split("_")[0];
|
||||
}
|
||||
|
||||
public GetFulfillmentRequestBody(PlatformOrderShopSync platformOrderShopSync) {
|
||||
|
|
|
|||
|
|
@ -16,10 +16,7 @@ import org.quartz.JobExecutionContext;
|
|||
import org.quartz.JobExecutionException;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
|
@ -83,7 +80,7 @@ public class ShopifySyncJob implements Job {
|
|||
GetFulfillmentRequest getFulfillmentRequest = new GetFulfillmentRequest(body);
|
||||
String responseStr = getFulfillmentRequest.rawSend().getBody();
|
||||
FulfillmentOrdersResponse response = mapper.readValue(responseStr, FulfillmentOrdersResponse.class);
|
||||
fulfillmentOrders.add(response.getFulfillmentOrders().get(0));
|
||||
fulfillmentOrders.addAll(response.getFulfillmentOrders());
|
||||
success = true;
|
||||
} catch (RuntimeException e) {
|
||||
log.error("Error communicating with ShopifyAPI", e);
|
||||
|
|
@ -109,6 +106,7 @@ public class ShopifySyncJob implements Job {
|
|||
}
|
||||
log.info("{} fulfillment creation requests to be sent to ShopifyAPI", createFulfillmentRequests.size());
|
||||
|
||||
Set<String> syncedPlatformOrderIds = new HashSet<>();
|
||||
List<CompletableFuture<Boolean>> fulfillmentCreationFutures = createFulfillmentRequests.stream()
|
||||
.map(changeOrderRequestBody -> CompletableFuture.supplyAsync(() -> {
|
||||
boolean success = false;
|
||||
|
|
@ -117,6 +115,9 @@ public class ShopifySyncJob implements Job {
|
|||
String responseStr = createFulfillmentRequest.rawSend().getBody();
|
||||
FulfillmentCreationResponse response = mapper.readValue(responseStr, FulfillmentCreationResponse.class);
|
||||
success = response.getFulfillment().isSuccess();
|
||||
if (success) {
|
||||
syncedPlatformOrderIds.add(response.getFulfillment().getOrderId());
|
||||
}
|
||||
} catch (RuntimeException e) {
|
||||
log.error("Error communicating with ShopifyAPI", e);
|
||||
} catch (JsonProcessingException e) {
|
||||
|
|
@ -128,5 +129,10 @@ public class ShopifySyncJob implements Job {
|
|||
results = fulfillmentCreationFutures.stream().map(CompletableFuture::join).collect(Collectors.toList());
|
||||
nbSuccesses = results.stream().filter(b -> b).count();
|
||||
log.info("{}/{} fulfillment creation requests have succeeded.", nbSuccesses, createFulfillmentRequests.size());
|
||||
|
||||
if (!syncedPlatformOrderIds.isEmpty()) {
|
||||
platformOrderService.updateShopifySynced(syncedPlatformOrderIds);
|
||||
log.info("Those orders have been marked as shopify synced : {} ", syncedPlatformOrderIds);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ import java.util.Date;
|
|||
/**
|
||||
* @Description: 平台订单表
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-01-25
|
||||
* @Version: V1.8
|
||||
* @Date: 2024-05-30
|
||||
* @Version: V1.9
|
||||
*/
|
||||
@ApiModel(value = "platform_order对象", description = "平台订单表")
|
||||
@Data
|
||||
|
|
@ -252,4 +252,11 @@ public class PlatformOrder implements Serializable {
|
|||
@Excel(name = "个人税号", width = 15)
|
||||
@ApiModelProperty(value = "个人税号")
|
||||
private java.lang.String taxNumber;
|
||||
/**
|
||||
* Shopify平台已同步(1=已同步，0=未同步)
|
||||
*/
|
||||
@Excel(name = "Shopify平台已同步(1=已同步，0=未同步)", width = 15, dicCode = "yn")
|
||||
@Dict(dicCode = "yn")
|
||||
@ApiModelProperty(value = "Shopify平台已同步(1=已同步，0=未同步)")
|
||||
private java.lang.String shopifySynced;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import org.jeecg.modules.business.vo.clientPlatformOrder.section.OrderQuantity;
|
|||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
@ -231,4 +232,5 @@ public interface PlatformOrderMapper extends BaseMapper<PlatformOrder> {
|
|||
List<String> findReadyAbnormalOrders(@Param("skus") List<String> skus, @Param("shops") List<String> shops);
|
||||
|
||||
List<String> findReadyAbnormalOrdersWithSkus(@Param("skus") List<String> skus);
|
||||
void updateShopifySynced(@Param("platformOrderIds") Collection<String> platformOrderIds);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -463,6 +463,7 @@
|
|||
#{shop}
|
||||
</foreach>
|
||||
AND ready_for_shopify_sync = 1
|
||||
AND shopify_synced = 0
|
||||
AND erp_status = 3
|
||||
ORDER BY shipping_time;
|
||||
</select>
|
||||
|
|
@ -1064,4 +1065,13 @@
|
|||
AND poc.erp_status <> 5
|
||||
AND poc.warehouse_name = '法国巴黎仓库-唯客路';
|
||||
</select>
|
||||
|
||||
<update id="updateShopifySynced">
|
||||
UPDATE platform_order
|
||||
SET shopify_synced = 1
|
||||
WHERE platform_order_id IN
|
||||
<foreach collection="platformOrderIds" separator="," open="(" close=")" index="index" item="platformOrderId">
|
||||
#{platformOrderId}
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -255,4 +255,5 @@ public interface IPlatformOrderService extends IService<PlatformOrder> {
|
|||
List<String> findReadyAbnormalOrders(List<String> skus, List<String> shops);
|
||||
|
||||
List<String> findReadyAbnormalOrdersWithSkus(List<String> skus);
|
||||
void updateShopifySynced(Collection<String> platformOrderIds);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -519,5 +519,9 @@ public class PlatformOrderServiceImpl extends ServiceImpl<PlatformOrderMapper, P
|
|||
@Override
|
||||
public List<String> findReadyAbnormalOrdersWithSkus(List<String> skus) {
|
||||
return platformOrderMap.findReadyAbnormalOrdersWithSkus(skus);
|
||||
|
||||
@Override
|
||||
public void updateShopifySynced(Collection<String> platformOrderIds) {
|
||||
platformOrderMap.updateShopifySynced(platformOrderIds);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,14 @@
|
|||
${AnsiColor.BRIGHT_BLUE}
|
||||
(_) | | | |
|
||||
_ ___ ___ ___ __ _ ______| |__ ___ ___ | |_
|
||||
| |/ _ \/ _ \/ __/ _` |______| '_ \ / _ \ / _ \| __|
|
||||
| | __/ __/ (_| (_| | | |_) | (_) | (_) | |_
|
||||
| |\___|\___|\___\__, | |_.__/ \___/ \___/ \__|
|
||||
_/ | __/ |
|
||||
|__/ |___/
|
||||
_ _ _ _____ ______ ______
|
||||
| || || (_____) /\ /\ (_____ (_____ \
|
||||
| || || | _ / \ / \ _____) )____) )
|
||||
| ||_|| | | | / /\ \ / /\ \| ____/ ____/
|
||||
| |___| |_| |_| |__| | | |__| | | | |
|
||||
\______(_____)______| |______|_| |_|
|
||||
|
||||
|
||||
${AnsiColor.BRIGHT_GREEN}
|
||||
Jeecg Boot Version: 3.6.3
|
||||
WIA APP Version: 2.2.0
|
||||
Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
|
||||
产品官网： www.jeecg.com
|
||||
版权所属： 北京国炬信息技术有限公司
|
||||
公司官网： www.guojusoft.com
|
||||
Website: www.wia-sourcing.com
|
||||
${AnsiColor.BLACK}
|
||||
|
|
|
|||
4
pom.xml
4
pom.xml
|
|
@ -2,9 +2,9 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.jeecgframework.boot</groupId>
|
||||
<artifactId>jeecg-boot-parent</artifactId>
|
||||
<version>3.6.3</version>
|
||||
<version>2.2.0</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>JEECG BOOT ${project.version}</name>
|
||||
<name>WIA APP ${project.version}</name>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
|
|
|
|||
Loading…
Reference in New Issue