| @@ -0,0 +1,15 @@ | |||||
| ALTER TABLE `mallink`.`wx_legion_activity_order` | |||||
| ADD COLUMN `cus_merchant_id` bigint NULL AFTER `cus_address`, | |||||
| ADD COLUMN `cus_legion_id` bigint NULL AFTER `cus_merchant_id`, | |||||
| ADD COLUMN `cus_union_id` bigint NULL AFTER `cus_legion_id`; | |||||
| update wx_legion_activity_order o | |||||
| left join wx_legion_activity_user u on o.cus_id = u.id | |||||
| set o.cus_merchant_id = u.merchant_id,o.cus_legion_id = u.legion_id,o.cus_union_id = u.union_id; | |||||
| ALTER TABLE `mallink`.`wx_legion_activity_order` | |||||
| MODIFY COLUMN `cus_merchant_id` bigint(20) NOT NULL AFTER `cus_address`, | |||||
| MODIFY COLUMN `cus_legion_id` bigint(20) NOT NULL AFTER `cus_merchant_id`, | |||||
| MODIFY COLUMN `cus_union_id` bigint(20) NOT NULL AFTER `cus_legion_id`; | |||||
| @@ -92,6 +92,13 @@ public class WxLegionActivityOrder extends TenantEntity { | |||||
| @TableField(value = "cus_address") | @TableField(value = "cus_address") | ||||
| private String cusAddress; | private String cusAddress; | ||||
| @TableField(value = "cus_merchant_id") | |||||
| private Long cusMerchantId; | |||||
| @TableField(value = "cus_legion_id") | |||||
| private Long cusLegionId; | |||||
| @TableField(value = "cus_union_id") | |||||
| private Long cusUnionId; | |||||
| /** | /** | ||||
| * 商户编号 | * 商户编号 | ||||
| */ | */ | ||||
| @@ -9,7 +9,7 @@ public class LegionActivityOrderTypeStatistics implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| private Long merchantId; | |||||
| private Long cusMerchantId; | |||||
| private Integer orderType; | private Integer orderType; | ||||
| private Integer count; | private Integer count; | ||||
| } | } | ||||
| @@ -405,7 +405,7 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe | |||||
| WxLegionActivityOrder orderQ = new WxLegionActivityOrder(); | WxLegionActivityOrder orderQ = new WxLegionActivityOrder(); | ||||
| orderQ.updateTenantInfo(activity); | orderQ.updateTenantInfo(activity); | ||||
| orderQ.setActivityId(activity.getId()); | orderQ.setActivityId(activity.getId()); | ||||
| orderQ.setLegionId(legionId); | |||||
| orderQ.setCusLegionId(legionId); | |||||
| orderQ.setAuditStatus(EnumLegionActivityOrderStatus.AUDI_SUCCESS.getCode()); | orderQ.setAuditStatus(EnumLegionActivityOrderStatus.AUDI_SUCCESS.getCode()); | ||||
| List<LegionActivityOrderTypeStatistics> orderTypeStatistics = wxLegionActivityOrderMapper.orderTypeStatistics(orderQ); | List<LegionActivityOrderTypeStatistics> orderTypeStatistics = wxLegionActivityOrderMapper.orderTypeStatistics(orderQ); | ||||
| Integer sign_order = 0,dif_legion = 0,dif_union = 0,eq_union = 0,not_union = 0; | Integer sign_order = 0,dif_legion = 0,dif_union = 0,eq_union = 0,not_union = 0; | ||||
| @@ -468,8 +468,8 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe | |||||
| List<LegionActivityOrderTypeStatistics> merchantStatistics = wxLegionActivityOrderMapper.merchantStatistics(orderQ); | List<LegionActivityOrderTypeStatistics> merchantStatistics = wxLegionActivityOrderMapper.merchantStatistics(orderQ); | ||||
| Map<Long, List<LegionActivityOrderTypeStatistics>> merchantStatisticsMap = new HashMap<>(); | Map<Long, List<LegionActivityOrderTypeStatistics>> merchantStatisticsMap = new HashMap<>(); | ||||
| if(merchantStatistics != null && !merchantStatistics.isEmpty()){ | if(merchantStatistics != null && !merchantStatistics.isEmpty()){ | ||||
| merchantIds.addAll(merchantStatistics.stream().map(LegionActivityOrderTypeStatistics::getMerchantId).distinct().collect(Collectors.toList())); | |||||
| merchantStatisticsMap = merchantStatistics.stream().collect(groupingBy(LegionActivityOrderTypeStatistics::getMerchantId)); | |||||
| merchantIds.addAll(merchantStatistics.stream().map(LegionActivityOrderTypeStatistics::getCusMerchantId).distinct().collect(Collectors.toList())); | |||||
| merchantStatisticsMap = merchantStatistics.stream().collect(groupingBy(LegionActivityOrderTypeStatistics::getCusMerchantId)); | |||||
| } | } | ||||
| if(merchantIds.isEmpty()){ | if(merchantIds.isEmpty()){ | ||||
| return Collections.emptyList(); | return Collections.emptyList(); | ||||
| @@ -14,6 +14,9 @@ | |||||
| <result property="cusId" column="cus_id" jdbcType="BIGINT"/> | <result property="cusId" column="cus_id" jdbcType="BIGINT"/> | ||||
| <result property="cusName" column="cus_name" jdbcType="VARCHAR"/> | <result property="cusName" column="cus_name" jdbcType="VARCHAR"/> | ||||
| <result property="cusAddress" column="cus_address" jdbcType="VARCHAR"/> | <result property="cusAddress" column="cus_address" jdbcType="VARCHAR"/> | ||||
| <result property="cusMerchantId" column="cus_merchant_id" jdbcType="BIGINT"/> | |||||
| <result property="cusLegionId" column="cus_legion_id" jdbcType="BIGINT"/> | |||||
| <result property="cusUnionId" column="cus_union_id" jdbcType="BIGINT"/> | |||||
| <result property="merchantId" column="merchant_id" jdbcType="BIGINT"/> | <result property="merchantId" column="merchant_id" jdbcType="BIGINT"/> | ||||
| <result property="legionId" column="legion_id" jdbcType="BIGINT"/> | <result property="legionId" column="legion_id" jdbcType="BIGINT"/> | ||||
| <result property="unionId" column="union_id" jdbcType="BIGINT"/> | <result property="unionId" column="union_id" jdbcType="BIGINT"/> | ||||
| @@ -31,6 +34,7 @@ | |||||
| id,tenant_id,parent_tenant_id, | id,tenant_id,parent_tenant_id, | ||||
| activity_id,order_no,order_money, | activity_id,order_no,order_money, | ||||
| cus_id,cus_name,cus_address, | cus_id,cus_name,cus_address, | ||||
| cus_merchant_id,cus_legion_id,cus_union_id, | |||||
| merchant_id,legion_id,union_id, | merchant_id,legion_id,union_id, | ||||
| order_type,create_by,create_date, | order_type,create_by,create_date, | ||||
| update_date,audit_remark,audit_status, | update_date,audit_remark,audit_status, | ||||
| @@ -233,11 +237,11 @@ | |||||
| <if test=" null != activityId "> | <if test=" null != activityId "> | ||||
| and `activity_id` = #{activityId} | and `activity_id` = #{activityId} | ||||
| </if> | </if> | ||||
| <if test=" null != legionId "> | |||||
| and `legion_id` = #{legionId} | |||||
| <if test=" null != cusLegionId "> | |||||
| and `cus_legion_id` = #{cusLegionId} | |||||
| </if> | </if> | ||||
| <if test=" null != merchantId "> | |||||
| and `merchant_id` = #{merchantId} | |||||
| <if test=" null != cusMerchantId "> | |||||
| and `cus_merchant_id` = #{cusMerchantId} | |||||
| </if> | </if> | ||||
| <if test=" null != auditStatus "> | <if test=" null != auditStatus "> | ||||
| and `audit_status` = #{auditStatus} | and `audit_status` = #{auditStatus} | ||||
| @@ -247,7 +251,7 @@ | |||||
| <select id="merchantStatistics" parameterType="com.iformall.domain.po.WxLegionActivityOrder" resultType="com.iformall.domain.vo.LegionActivityOrderTypeStatistics"> | <select id="merchantStatistics" parameterType="com.iformall.domain.po.WxLegionActivityOrder" resultType="com.iformall.domain.vo.LegionActivityOrderTypeStatistics"> | ||||
| SELECT merchant_id as 'merchantId', | |||||
| SELECT cus_merchant_id as 'cusMerchantId', | |||||
| order_type as 'orderType', | order_type as 'orderType', | ||||
| count(1) as 'count' | count(1) as 'count' | ||||
| FROM wx_legion_activity_order | FROM wx_legion_activity_order | ||||
| @@ -261,11 +265,11 @@ | |||||
| <if test=" null != activityId "> | <if test=" null != activityId "> | ||||
| and `activity_id` = #{activityId} | and `activity_id` = #{activityId} | ||||
| </if> | </if> | ||||
| <if test=" null != legionId "> | |||||
| and `legion_id` = #{legionId} | |||||
| <if test=" null != cusLegionId "> | |||||
| and `cus_legion_id` = #{cusLegionId} | |||||
| </if> | </if> | ||||
| <if test=" null != merchantId "> | |||||
| and `merchant_id` = #{merchantId} | |||||
| <if test=" null != cusMerchantId "> | |||||
| and `cus_merchant_id` = #{cusMerchantId} | |||||
| </if> | </if> | ||||
| <if test=" null != auditStatus "> | <if test=" null != auditStatus "> | ||||
| and `audit_status` = #{auditStatus} | and `audit_status` = #{auditStatus} | ||||