diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java new file mode 100644 index 000000000..4dabee6ab --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -0,0 +1,98 @@ +package com.iformall.controller.market; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxCashBackActivity; +import com.iformall.domain.po.WxCashOut; +import com.iformall.domain.po.base.BaseEntity.SortField; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumCashBackActivityRecordStatus; +import com.iformall.enums.EnumCashBackActivityStatus; +import com.iformall.enums.EnumCashOutStatus; +import com.iformall.enums.EnumYesOrNo; +import com.iformall.service.WxCUserService; +import com.iformall.service.WxCashBackActivityService; +import com.iformall.service.WxCashOutService; +import com.iformall.service.WxMallService; +import com.iformall.service.WxMerchantService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author alascor + * + */ +@RestController +@RequestMapping("/cashback") +@Api(description = "现金返现活动相关接口") +public class WxCashBackActivityController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxCashBackActivityService wxCashBackActivityService; + @Autowired + WxCUserService wxCUserService; + @Autowired + WxMerchantService wxMerchantService; + @Autowired + WxMallService wxMallService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCashBackActivity wxCashBackActivity, Integer pageNum, Integer pageSize) { + if (null == wxCashBackActivity) wxCashBackActivity = new WxCashBackActivity(); + TenantEntity tenantInfo = getTenantInfo(); + wxCashBackActivity.updateTenantInfo(tenantInfo); + if (null != wxCashBackActivity.getStatus() && wxCashBackActivity.getStatus().intValue()>0) { + //已上架 + if (wxCashBackActivity.getStatus().intValue() == EnumCashBackActivityStatus.ON_LINE.getCode().intValue()) { + wxCashBackActivity.setValidTime(EnumYesOrNo.YES.getCode()); + } + //已过期 + if (wxCashBackActivity.getStatus().intValue() == 2) { + wxCashBackActivity.setStatus(null); + wxCashBackActivity.setValidTime(EnumYesOrNo.NO.getCode()); + } + } + wxCashBackActivity.setSortColumns(SortField.CreateDate_DESC); + final PageInfo page = wxCashBackActivityService.listActivityAsPage(wxCashBackActivity, pageNum, pageSize); + if (null != page && null != page.getList()) { + for (WxCashBackActivity a : page.getList()) { + a.setItemCount(wxCashBackActivityService.getItemCount(a)); + int allRecordCount = wxCashBackActivityService.getRecordCount(a, null); + int successRecordCount = wxCashBackActivityService.getRecordCount(a, EnumCashBackActivityRecordStatus.AUDI_SUCCESS); + a.setRecordCount(allRecordCount); + a.setAuditSuccessRecordCount(successRecordCount); + a.setMerchantCount(wxCashBackActivityService.getMerchantCount(a)); + } + } + + return new ResultData(page); + } + + @ApiOperation("查询当前提现信息") + @GetMapping("getInfo") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "主键id", dataType = "Long", paramType = "query", required = true)}) + public ResultData getCurrentCashOutData(Long id) { + TenantEntity tenantInfo = getTenantInfo(); + WxCashOut out = wxCashOutService.getById(id, tenantInfo.getTenantId()); + return new ResultData(out); + } +} diff --git a/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql b/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql index de6abc4d0..8b280e3fc 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql @@ -28,3 +28,38 @@ CREATE TABLE `wx_cash_back_activity_item` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='卡券'; +CREATE TABLE `wx_cash_back_activity_record` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `parent_tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID', + `activity_id` bigint(20) NOT NULL COMMENT '活动', + `item_id` bigint(20) DEFAULT NULL COMMENT '选项', + `order_no` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '订单号', + `order_money` decimal(10,3) DEFAULT NULL COMMENT '订单金额', + `cus_name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户姓名', + `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', + `phone` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户电话', + `address` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '客户地址', + `audit_remark` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '审批意见', + `audit_status` int(1) DEFAULT NULL COMMENT '审批状态', + `cash_rate` decimal(10,3) DEFAULT NULL COMMENT '返现比率', + `cash_money` decimal(10,3) DEFAULT NULL COMMENT '返现金额', + `mall_cash_money` decimal(10,3) DEFAULT NULL COMMENT '商管承担返现金额', + `merchant_cash_money` decimal(10,3) DEFAULT NULL COMMENT '商户承担返现金额', + `merchant_id` bigint(20) NOT NULL COMMENT '商户编号', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='卡券'; + + +CREATE TABLE `wx_cash_back_activity_merchant` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `parent_tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID', + `activity_id` bigint(20) NOT NULL COMMENT '活动编号', + `merchant_id` bigint(20) NOT NULL COMMENT '商户编号', + `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='卡券'; + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java index 04f5f8bd6..7d8ab59b3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java @@ -39,4 +39,16 @@ public class WxCashBackActivity extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "最低订单金额", name = "limitMoney") private Integer limitMoney; + @TableField(exist = false) + private Integer validTime; + + @TableField(exist = false) + private Integer itemCount; + @TableField(exist = false) + private Integer recordCount; + @TableField(exist = false) + private Integer merchantCount; + @TableField(exist = false) + private Integer auditSuccessRecordCount; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityMerchant.java new file mode 100644 index 000000000..6e0709e63 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityMerchant.java @@ -0,0 +1,27 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; + +@TableName(value = "wx_cash_back_activity_merchant") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxCashBackActivityMerchant extends TenantEntity { + + private Long id; + + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") + private Date createDate; + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") + private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value = "名称", name = "activityId") + private Long activityId; + @io.swagger.annotations.ApiModelProperty(value = "最低订单金额", name = "merchantId") + private Long merchantId; + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java new file mode 100644 index 000000000..97bb0c49d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java @@ -0,0 +1,61 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@TableName(value = "wx_cash_back_activity_record") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxCashBackActivityRecord extends TenantEntity { + + private Long id; + + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") + private Date createDate; + @TableField(exist = false) + private Date createDateBegin; + @TableField(exist = false) + private Date createDateEnd; + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") + private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value = "活动", name = "activityId") + private Long activityId; + @io.swagger.annotations.ApiModelProperty(value = "选项", name = "itemId") + private Long itemId; + @io.swagger.annotations.ApiModelProperty(value = "订单号", name = "orderNo") + private String orderNo; + @io.swagger.annotations.ApiModelProperty(value = "订单金额", name = "orderMoney") + private BigDecimal orderMoney; + @io.swagger.annotations.ApiModelProperty(value = "客户姓名", name = "cusName") + private String cusName; + @io.swagger.annotations.ApiModelProperty(value = "客户电话", name = "phone") + private String phone; + @io.swagger.annotations.ApiModelProperty(value = "客户地址", name = "address") + private String address; + @io.swagger.annotations.ApiModelProperty(value = "EnumCashBackActivityRecordStatus", name = "auditStatus") + private Integer auditStatus; + @TableField(exist = false) + private List auditStatusList; + @io.swagger.annotations.ApiModelProperty(value = "审核内容", name = "auditRemark") + private String auditRemark; + @io.swagger.annotations.ApiModelProperty(value = "返现比率", name = "cashRate") + private BigDecimal cashRate; + @io.swagger.annotations.ApiModelProperty(value = "返现金额", name = "cashMoney") + private BigDecimal cashMoney; + @io.swagger.annotations.ApiModelProperty(value = "商管承担返现金额", name = "mallCashMoney") + private BigDecimal mallCashMoney; + @io.swagger.annotations.ApiModelProperty(value = "商户承担返现金额", name = "merchantCashMoney") + private BigDecimal merchantCashMoney; + @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") + private Long merchantId; + +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityItemStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityRecordStatus.java similarity index 67% rename from mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityItemStatus.java rename to mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityRecordStatus.java index 52de247b3..0f3f3e709 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityItemStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityRecordStatus.java @@ -4,14 +4,14 @@ package com.iformall.enums; /** * @author gongbiao */ -public enum EnumCashBackActivityItemStatus { +public enum EnumCashBackActivityRecordStatus { AUDTING(0, "审核中"), AUDI_SUCCESS(1, "审批通过"), AUDT_FAIL(2, "审批拒绝"); - public static EnumCashBackActivityItemStatus getEnum(Integer code) { - for (EnumCashBackActivityItemStatus value : values()) { + public static EnumCashBackActivityRecordStatus getEnum(Integer code) { + for (EnumCashBackActivityRecordStatus value : values()) { if (value.getCode().equals(code)) { return value; } @@ -22,7 +22,7 @@ public enum EnumCashBackActivityItemStatus { private Integer code; private String message; - EnumCashBackActivityItemStatus(Integer code, String message) { + EnumCashBackActivityRecordStatus(Integer code, String message) { this.code = code; this.message = message; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityItemMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityItemMapper.java index 75f7dc553..fa207280a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityItemMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityItemMapper.java @@ -12,4 +12,6 @@ public interface WxCashBackActivityItemMapper extends CommonMapper findList(WxCashBackActivityItem wxCashBackActivity); + + Integer itemCount(WxCashBackActivityItem wxCashBackActivity); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityMerchantMapper.java new file mode 100644 index 000000000..44d4a039b --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityMerchantMapper.java @@ -0,0 +1,20 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCashBackActivityMerchant; + +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface WxCashBackActivityMerchantMapper extends CommonMapper { + + WxCashBackActivityMerchant selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + List findList(WxCashBackActivityMerchant wxCashBackActivity); + + void delete(WxCashBackActivityMerchant wxCashBackActivity); + + int merchantCount(WxCashBackActivityMerchant wxCashBackActivity); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityRecordMapper.java new file mode 100644 index 000000000..f285cb872 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityRecordMapper.java @@ -0,0 +1,20 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCashBackActivityRecord; + +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface WxCashBackActivityRecordMapper extends CommonMapper { + + WxCashBackActivityRecord selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + List findList(WxCashBackActivityRecord wxCashBackActivity); + + void updateStatus(WxCashBackActivityRecord wxCashBackActivity); + + Integer selectCount(WxCashBackActivityRecord wxCashBackActivity); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java index 8bd17bc77..4ed4d4aff 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java @@ -5,6 +5,7 @@ import java.util.List; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCashBackActivity; import com.iformall.domain.po.WxCashBackActivityItem; +import com.iformall.enums.EnumCashBackActivityRecordStatus; public interface WxCashBackActivityService { @@ -20,6 +21,10 @@ public interface WxCashBackActivityService { PageInfo listActivityItemAsPage(WxCashBackActivityItem record, Integer pageIndex, Integer pageSize); + int getItemCount(WxCashBackActivity record); + int getRecordCount(WxCashBackActivity record,EnumCashBackActivityRecordStatus status); + int getMerchantCount(WxCashBackActivity record); + /** * 根据Id获得实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java index 5980c689c..b40f5f13a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java @@ -4,8 +4,13 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCashBackActivity; import com.iformall.domain.po.WxCashBackActivityItem; +import com.iformall.domain.po.WxCashBackActivityMerchant; +import com.iformall.domain.po.WxCashBackActivityRecord; +import com.iformall.enums.EnumCashBackActivityRecordStatus; import com.iformall.mapper.WxCashBackActivityItemMapper; import com.iformall.mapper.WxCashBackActivityMapper; +import com.iformall.mapper.WxCashBackActivityMerchantMapper; +import com.iformall.mapper.WxCashBackActivityRecordMapper; import com.iformall.service.WxCashBackActivityService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,6 +27,10 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService WxCashBackActivityMapper wxCashBackActivityMapper; @Autowired WxCashBackActivityItemMapper wxCashBackActivityItemMapper; + @Autowired + WxCashBackActivityRecordMapper wxCashBackActivityRecordMapper; + @Autowired + WxCashBackActivityMerchantMapper wxCashBackActivityMerchantMapper; @Override public PageInfo listActivityAsPage(WxCashBackActivity record, Integer pageIndex, Integer pageSize) { @@ -32,6 +41,14 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService public PageInfo listActivityItemAsPage(WxCashBackActivityItem record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCashBackActivityItemMapper.findList(record)); } + + @Override + public int getItemCount(WxCashBackActivity record) { + WxCashBackActivityItem item = new WxCashBackActivityItem(); + item.setActivityId(record.getId()); + item.updateTenantInfo(record); + return wxCashBackActivityItemMapper.itemCount(item); + } @Override public WxCashBackActivity getActivityById(Long id,String tenantId) { @@ -56,5 +73,26 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService return wxCashBackActivityItemMapper.findList(ai); } + @Override + public int getRecordCount(WxCashBackActivity record, EnumCashBackActivityRecordStatus status) { + WxCashBackActivityRecord r = new WxCashBackActivityRecord(); + r.setActivityId(record.getId()); + r.updateTenantInfo(record); + if (null != status) { + r.setAuditStatus(status.getCode()); + } + return wxCashBackActivityRecordMapper.selectCount(r); + } + + @Override + public int getMerchantCount(WxCashBackActivity record) { + WxCashBackActivityMerchant m = new WxCashBackActivityMerchant(); + m.setActivityId(record.getId()); + m.updateTenantInfo(record); + return wxCashBackActivityMerchantMapper.merchantCount(m); + } + + + } diff --git a/mallinkService/src/main/resources/mapper/WxCashBackActivityItemMapper.xml b/mallinkService/src/main/resources/mapper/WxCashBackActivityItemMapper.xml index 312a66c17..680e2df8a 100644 --- a/mallinkService/src/main/resources/mapper/WxCashBackActivityItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCashBackActivityItemMapper.xml @@ -67,5 +67,9 @@ select from wx_cash_back_activity_item + + \ No newline at end of file diff --git a/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml index be37f575e..fd0081226 100644 --- a/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml @@ -39,6 +39,14 @@ and `create_date` <= #{createDateEnd} + + + and end_time >= now() + + + + and end_time <= now() + and `name` like concat('%', #{name},'%') diff --git a/mallinkService/src/main/resources/mapper/WxCashBackActivityMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCashBackActivityMerchantMapper.xml new file mode 100644 index 000000000..a54c0042f --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCashBackActivityMerchantMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`activity_id`,`merchant_id`,`create_date`,`update_date` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `activity_id` = #{activityId} + + + + and `merchant_id` = #{merchantId} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + delete from wx_cash_back_activity_merchant + where `activity_id` = #{activityId} + + and `merchant_id` = #{merchantId} + + + + + + \ No newline at end of file diff --git a/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml new file mode 100644 index 000000000..1c4453e46 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`activity_id`,`item_id`,`order_no`,`order_money`,`cus_name`,`create_date`,`update_date`,`phone`, + `address`,`audit_remark`,`audit_status`,`cash_rate`,`cash_money`,`mall_cash_money`,`merchant_cash_money`,`merchant_id` + + + + where 1 = 1 + + + and `id` = #{id} + + + and `merchant_id` = #{merchantId} + + + and `activity_id` = #{activityId} + + + and `item_id` = #{itemId} + + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `create_date` >= #{createDateBegin} + + + + and `create_date` <= #{createDateEnd} + + + + and `cus_name` like concat('%', #{cusName},'%') + + + + and `phone` like concat('%', #{phone},'%') + + + + and `order_no` like concat('%', #{orderNo},'%') + + + + and `audit_status` = #{auditStatus} + + + + and audit_status in + + #{statusItem} + + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + update wx_cash_back_activity_record + set `audit_status` = #{auditStatus}, + + `audit_remark` = #{auditRemark}, + + + `cash_rate` = #{cashRate}, + + + `cash_money` = #{cashMoney}, + + + `mall_cash_money` = #{mallCashMoney}, + + + `merchant_cash_money` = #{merchantCashMoney}, + + `update_date` = #{updateDate} + where id=#{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + + + \ No newline at end of file