Skip to content

W
wangxiaolu-sfa-module-job
提交 e80ccadf authored 作者: 吕本才's avatar 吕本才
浏览文件
操作

1、字段调整2、增加xxljob日志3、旺店通分页bug

上级 544ce747
显示空白字符变更
内嵌 并排
正在显示 包含 22 行增加 和 29 行删除
src/main/java/com/sfa/job/domain/order/entity/FinanceOrderDetail.java
浏览文件 @ e80ccadf
......@@ -3,6 +3,7 @@ package com.sfa.job.domain.order.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.sfa.common.core.web.domain.BaseDo;
import lombok.Data;
import org.apache.commons.lang3.ObjectUtils;
......@@ -17,7 +18,7 @@ import java.util.regex.Pattern;
*/
@TableName(value = "finance_order_detail")
@Data
public class FinanceOrderDetail {
public class FinanceOrderDetail extends BaseDo {
// 订单唯一键
private Long tradeId;
// 订单明细唯一键
......@@ -31,7 +32,7 @@ public class FinanceOrderDetail {
private String srcTid;
// 赠品方式 0、非赠品
// 1、自动赠送 2、手工赠送 4、周期购赠送 8、平台赠送 32、阶梯满赠 64、CRM追加赠送 128 主品
// private Integer giftType;
private Integer giftType;
// 0:未付款 1:部分付款 2:已付款（原始订单的支付状态）
private Integer payStatus;
// 退款状态:
......@@ -47,7 +48,7 @@ public class FinanceOrderDetail {
// 1、担保
// 2、非担保
// 3、在线非担保
// private Integer guaranteeMode;
private Integer guaranteeMode;
// 如果没有对应的原始单明细,则返回0.
// 平台状态:
// 10、未确认
......
src/main/java/com/sfa/job/pojo/request/WangdiantongQueryVO.java
浏览文件 @ e80ccadf
......@@ -11,5 +11,4 @@ import lombok.Data;
public class WangdiantongQueryVO {
private String start_time;
private String end_time;
}
src/main/java/com/sfa/job/service/order/impl/FinanceOrderSyncServiceImpl.java
浏览文件 @ e80ccadf
......@@ -112,6 +112,7 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper,
WangdiantongQueryDto wangdiantongQueryDto = wangdiantongUtil.queryWithDetail(wangdiantongQueryVO, beginPageNo);
JSONArray orderAllArray = wangdiantongQueryDto.getResult();
if (ObjectUtils.isEmpty(orderAllArray)) {
detailDto.setMessage(String.format("旺店通没有查询到订单数据"));
throw new ServiceException("旺店通没有查询到订单数据");
}
......@@ -188,21 +189,17 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper,
orderDetail.setActualCost(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ?
baseProductMap.get(orderDetail.getGoodsNo()).getActualCost() :
new BigDecimal(0)
// (ObjectUtils.isNotEmpty(order.getGoodsTypeCount()) && (order.getGoodsTypeCount().signum()!= 0) ? order.getGoodsCost().divide(order.getGoodsTypeCount()).setScale(4, BigDecimal.ROUND_HALF_UP) : new BigDecimal(0))
);
orderDetail.setStandardCost(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ?
baseProductMap.get(orderDetail.getGoodsNo()).getStandardCost() :
new BigDecimal(0)
// (ObjectUtils.isNotEmpty(order.getGoodsTypeCount()) && (order.getGoodsTypeCount().signum()!= 0) ? order.getGoodsCost().divide(order.getGoodsTypeCount()).setScale(4, BigDecimal.ROUND_HALF_UP) : new BigDecimal(0))
);
orderDetail.setSumActualCost(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ?
baseProductMap.get(orderDetail.getGoodsNo()).getActualCost().multiply(orderDetail.getNum()) :
new BigDecimal(0));
orderDetail.setSumStandardCost(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ?
baseProductMap.get(orderDetail.getGoodsNo()).getStandardCost().multiply(orderDetail.getNum()) :
new BigDecimal(0)
// (ObjectUtils.isNotEmpty(order.getGoodsTypeCount()) && (order.getGoodsTypeCount().signum()!= 0) ? order.getGoodsCost().divide(order.getGoodsTypeCount()).setScale(4, BigDecimal.ROUND_HALF_UP) : new BigDecimal(0))
);
orderDetail.setSumActualCost(orderDetail.getActualCost().multiply(orderDetail.getNum()));
orderDetail.setSumStandardCost(orderDetail.getStandardCost().multiply(orderDetail.getNum()));
// 将退款成功的数据分摊后总价置为0 2025年02月06日16:25:30
if (ObjectUtils.isNotEmpty(orderDetail.getRefundStatus()) && orderDetail.getRefundStatus().equals(5)) {
orderDetail.setShareAmount(new BigDecimal(0));
}
}
mergeList.addAll(orderDetails);
}
......
src/main/java/com/sfa/job/util/WangdiantongUtil.java
浏览文件 @ e80ccadf
......@@ -89,7 +89,7 @@ public class WangdiantongUtil {
throw new ServiceException("访问旺店通接口错误" + messageJson.toString());
}
totalCount = dataR.getInteger("total_count");
maxPage = (totalCount / 200)+1;
maxPage = totalCount / 200;
JSONArray orderJsonArray = dataR.getJSONArray("order");
allArray.addAll(orderJsonArray);
......
src/main/java/com/sfa/job/xxljob/order/FinanceOrderTask.java
浏览文件 @ e80ccadf
......@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import com.sfa.job.pojo.response.FinanceSyncOrderDetailDto;
import com.sfa.job.service.order.FinanceOrderSyncService;
import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -24,21 +25,23 @@ public class FinanceOrderTask {
/**
* 同步部门数据
*/
@XxlJob("syncWandiantongOrderDeatail")
public FinanceSyncOrderDetailDto syncWandiantongOrderDeatail() {
@XxlJob("syncWangdiantongOrderDetail")
public FinanceSyncOrderDetailDto syncWangdiantongOrderDetail() {
Long st = System.currentTimeMillis();
// 暂不考虑分片
XxlJobContext xxlJobContext = XxlJobContext.getXxlJobContext();
int shardingTotalCount = xxlJobContext.getShardTotal();
int shardingItem = xxlJobContext.getShardIndex();
XxlJobHelper.log(">>>>>>>>>>syncWangdiantongOrderDetail Job start<<<<<<<<<<");
// 简单模拟分片处理，这里输出每个分片的信息
System.out.println("分片总数: " + shardingTotalCount + ", 当前分片: " + shardingItem);
XxlJobHelper.log("分片总数: " + shardingTotalCount + ", 当前分片: " + shardingItem);
XxlJobHelper.log("xxl-job开始同步-旺店通订单明细api接口数据");
log.info("xxl-job开始同步-旺店通订单明细api接口数据");
// 定时任务不设定开始时间和结束时间
FinanceSyncOrderDetailDto detailDto = financeOrderSyncService.syncWangdiantongOrder(null, null,0);
log.info("xxl-job结束同步-旺店通订单明细api接口数据, 共同步订单{}条数据，订单明细{}条,订单批次号：{},订单的开始时间{}和结束时间{}",
XxlJobHelper.log("xxl-job结束同步-旺店通订单明细api接口数据, 共同步订单{}条数据，订单明细{}条,订单批次号：{},订单的开始时间{}和结束时间{}",
detailDto.getOrderCount(),detailDto.getOrderDetailCount(),detailDto.getBatchNo(),
DateUtil.formatDateTime(detailDto.getStartTime()),DateUtil.formatDateTime(detailDto.getEndTime()) );
return detailDto;
......
src/main/resources/mapper/order/FinanceOrderDetailMapper.xml
浏览文件 @ e80ccadf
......@@ -142,8 +142,6 @@
<sql id="Base_Column_List">
trade_id, rec_id, platform_id, src_oid, src_tid, pay_status, refund_status, platform_status, delivery_term,
num, price, refund_num, order_price, share_price, adjust, discount, share_amount, tax_rate,
goods_name, goods_no, spec_name, spec_no, spec_code, suite_no, suite_name, suite_num, suite_amount,
......@@ -247,12 +245,7 @@
<result column="sync_type" property="syncType" jdbcType="TINYINT"/>
<result column="actual_cost" property="actualCost" jdbcType="DECIMAL"/>
<result column="standard_cost" property="standardCost" jdbcType="DECIMAL"/>
<result column="share_amount_sum" property="shareAmountSum" jdbcType="DECIMAL"/>
<result column="actual_cost_sum" property="actualCostSum" jdbcType="DECIMAL"/>
<result column="standard_cost_sum" property="standardCostSum" jdbcType="DECIMAL"/>
<result column="share_amount_diff_sum" property="shareAmountDiffSum" jdbcType="DECIMAL"/>
<result column="query_type" property="queryType" jdbcType="VARCHAR"/>
<result column="sum_actual_cost" property="sumActualCost" jdbcType="DECIMAL"/>
<result column="sum_standard_cost" property="sumStandardCost" jdbcType="DECIMAL"/>
</resultMap>
</mapper>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论