feat(dealer): 添加分销订单结算月份字段
- 在 ShopDealerCapital 实体中新增 month 字段用于记录结算月份- 更新 SdyDealerOrderController 控制器,在保存分销商资金记录时设置 month 字段- 调整 ShopDealerCapitalMapper.xml 中的查询条件格式以适配新字段
This commit is contained in:
@@ -146,6 +146,7 @@ public class SdyDealerOrderController extends BaseController {
|
||||
shopDealerCapital.setUserId(shopDealerOrder.getFirstUserId());
|
||||
shopDealerCapital.setOrderNo(shopDealerOrder.getOrderNo());
|
||||
shopDealerCapital.setMoney(shopDealerOrder.getFirstMoney());
|
||||
shopDealerCapital.setMonth(shopDealerOrder.getMonth());
|
||||
shopDealerCapital.setComments("分销订单结算");
|
||||
shopDealerCapital.setToUserId(shopDealerOrder.getUserId());
|
||||
shopDealerCapitalService.save(shopDealerCapital);
|
||||
@@ -161,6 +162,7 @@ public class SdyDealerOrderController extends BaseController {
|
||||
shopDealerCapital2.setUserId(shopDealerOrder.getSecondUserId());
|
||||
shopDealerCapital2.setOrderNo(shopDealerOrder.getOrderNo());
|
||||
shopDealerCapital2.setMoney(shopDealerOrder.getSecondMoney());
|
||||
shopDealerCapital2.setMonth(shopDealerOrder.getMonth());
|
||||
shopDealerCapital2.setComments("分销订单结算");
|
||||
shopDealerCapital2.setToUserId(shopDealerOrder.getUserId());
|
||||
shopDealerCapitalService.save(shopDealerCapital2);
|
||||
@@ -177,6 +179,7 @@ public class SdyDealerOrderController extends BaseController {
|
||||
shopDealerCapital3.setUserId(shopDealerOrder.getThirdUserId());
|
||||
shopDealerCapital3.setOrderNo(shopDealerOrder.getOrderNo());
|
||||
shopDealerCapital3.setMoney(shopDealerOrder.getThirdMoney());
|
||||
shopDealerCapital3.setMonth(shopDealerOrder.getMonth());
|
||||
shopDealerCapital3.setComments("分销订单结算");
|
||||
shopDealerCapital3.setToUserId(shopDealerOrder.getUserId());
|
||||
shopDealerCapitalService.save(shopDealerCapital3);
|
||||
|
||||
@@ -49,6 +49,9 @@ public class ShopDealerCapital implements Serializable {
|
||||
@TableField(exist = false)
|
||||
private String toNickName;
|
||||
|
||||
@Schema(description = "结算月份")
|
||||
private String month;
|
||||
|
||||
@Schema(description = "商城ID")
|
||||
private Integer tenantId;
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
AND a.create_time <= #{param.createTimeEnd}
|
||||
</if>
|
||||
<if test="param.month != null">
|
||||
AND b.month = #{param.month}
|
||||
AND b.month = #{param.month}
|
||||
</if>
|
||||
<if test="param.keywords != null">
|
||||
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
|
||||
|
||||
Reference in New Issue
Block a user