Преглед изворни кода

Merge branch 'release_toaliyun_real_offline_activity' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_offline_activity

release_toaliyun_real
winter пре 1 година
родитељ
комит
638c12223d
9 измењених фајлова са 32 додато и 21 уклоњено
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java
  3. +9
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivitySettlement.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantSettlementMapper.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java
  7. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java
  8. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java
  9. +1
    -9
      mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java Прегледај датотеку

@@ -85,7 +85,7 @@ public class WxOfflineActivitySettlementController extends BaseController {
@ApiOperation("单个活动结算列表") @ApiOperation("单个活动结算列表")
@GetMapping("activitySettlement") @GetMapping("activitySettlement")
@ApiImplicitParams({}) @ApiImplicitParams({})
public ResultData activitySettlement(@ModelAttribute WxOfflineActivityGrantSettlement grantSettlement) {
public ResultData activitySettlement(@ModelAttribute OfflineActivitySettlement grantSettlement) {


if(grantSettlement.getActivityId() == null){ if(grantSettlement.getActivityId() == null){
return new ResultData(Result.ERROR,"请选择活动"); return new ResultData(Result.ERROR,"请选择活动");
@@ -101,7 +101,7 @@ public class WxOfflineActivitySettlementController extends BaseController {
@ApiOperation("单个活动单个门店结算汇总") @ApiOperation("单个活动单个门店结算汇总")
@GetMapping("merchantSettlementStatistics") @GetMapping("merchantSettlementStatistics")
@ApiImplicitParams({}) @ApiImplicitParams({})
public ResultData merchantSettlementStatistics(@ModelAttribute WxOfflineActivityGrantSettlement grantSettlement) {
public ResultData merchantSettlementStatistics(@ModelAttribute OfflineActivitySettlement grantSettlement) {


if(grantSettlement.getActivityId() == null){ if(grantSettlement.getActivityId() == null){
return new ResultData(Result.ERROR,"请选择活动"); return new ResultData(Result.ERROR,"请选择活动");


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java Прегледај датотеку

@@ -153,6 +153,7 @@ public class WxOfflineActivityRecord extends TenantEntity {
/** /**
* 审批意见 * 审批意见
*/ */
@Excel(name = "审核意见", width = 20, orderNum = "9")
@TableField(value = "audit_remark") @TableField(value = "audit_remark")
private String auditRemark; private String auditRemark;


@@ -169,12 +170,14 @@ public class WxOfflineActivityRecord extends TenantEntity {
@TableField(value = "audit_by") @TableField(value = "audit_by")
private Long auditBy; private Long auditBy;


@Excel(name = "审核人", width = 20, orderNum = "11")
@TableField(exist = false) @TableField(exist = false)
private String auditByName; private String auditByName;


/** /**
* 审核时间 * 审核时间
*/ */
@Excel(name = "审核意见", width = 20, format = "yyyy-MM-dd HH:mm:ss", orderNum = "10")
@TableField(value = "audit_time") @TableField(value = "audit_time")
private Date auditTime; private Date auditTime;




+ 9
- 0
mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivitySettlement.java Прегледај датотеку

@@ -1,5 +1,6 @@
package com.iformall.domain.vo; package com.iformall.domain.vo;


import com.iformall.common.SortColumn;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import lombok.Data; import lombok.Data;


@@ -10,13 +11,21 @@ import java.util.List;
@Data @Data
public class OfflineActivitySettlement extends TenantEntity { public class OfflineActivitySettlement extends TenantEntity {


private Long id;
private List<Long> merchantIdList;

private Long activityId; private Long activityId;
private Long merchantId; private Long merchantId;
private String merchantName; private String merchantName;


@SortColumn(column = "recordCount")
private Integer recordCount; private Integer recordCount;
@SortColumn(column = "sumOrderMoney")
private BigDecimal sumOrderMoney; private BigDecimal sumOrderMoney;
@SortColumn(column = "sumGrantPrice")
private BigDecimal sumGrantPrice; private BigDecimal sumGrantPrice;
@SortColumn(column = "sumMallPrice")
private BigDecimal sumMallPrice; private BigDecimal sumMallPrice;
@SortColumn(column = "sumMerchantPrice")
private BigDecimal sumMerchantPrice; private BigDecimal sumMerchantPrice;
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantSettlementMapper.java Прегледај датотеку

@@ -21,7 +21,7 @@ public interface WxOfflineActivityGrantSettlementMapper extends CommonMapper<WxO


OfflineActivitySettlementStatistics settlementStatistics(WxOfflineActivityGrantSettlement settlement); OfflineActivitySettlementStatistics settlementStatistics(WxOfflineActivityGrantSettlement settlement);


List<OfflineActivitySettlement> getActivitySettlement(WxOfflineActivityGrantSettlement settlement);
List<OfflineActivitySettlement> getActivitySettlement(OfflineActivitySettlement settlement);


List<WxOfflineActivityGrantSettlement> findList(WxOfflineActivityGrantSettlement settlement); List<WxOfflineActivityGrantSettlement> findList(WxOfflineActivityGrantSettlement settlement);
} }


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java Прегледај датотеку

@@ -26,9 +26,9 @@ public interface WxOfflineActivityGrantSettlementService {


PageInfo<WxOfflineActivity> activityListAsPage(WxOfflineActivity wxOfflineActivity, Integer pageNum, Integer pageSize); PageInfo<WxOfflineActivity> activityListAsPage(WxOfflineActivity wxOfflineActivity, Integer pageNum, Integer pageSize);


List<OfflineActivitySettlement> getActivitySettlement(WxOfflineActivityGrantSettlement grantSettlement);
List<OfflineActivitySettlement> getActivitySettlement(OfflineActivitySettlement grantSettlement);


Map<String, Object> merchantSettlementStatistics(WxOfflineActivityGrantSettlement grantSettlement);
Map<String, Object> merchantSettlementStatistics(OfflineActivitySettlement grantSettlement);


List<WxOfflineActivityGrantSettlement> findList(WxOfflineActivityGrantSettlement grantSettlement); List<WxOfflineActivityGrantSettlement> findList(WxOfflineActivityGrantSettlement grantSettlement);




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java Прегледај датотеку

@@ -513,7 +513,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
handlerRecordQuery(wxOfflineActivityRecord); handlerRecordQuery(wxOfflineActivityRecord);
List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord);
handlerRecordList(wxOfflineActivityRecord,recordList); handlerRecordList(wxOfflineActivityRecord,recordList);
excelService.exportExcel(recordList, null, "用户参加活动订单列表", WxOfflineActivityGrantSettlement.class, "用户参加活动订单列表.xlsx", response, false);
excelService.exportExcel(recordList, null, "用户参加活动订单列表", WxOfflineActivityRecord.class, "用户参加活动订单列表.xlsx", response, false);
} }


@Override @Override


+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java Прегледај датотеку

@@ -245,7 +245,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
} }


@Override @Override
public List<OfflineActivitySettlement> getActivitySettlement(WxOfflineActivityGrantSettlement record) {
public List<OfflineActivitySettlement> getActivitySettlement(OfflineActivitySettlement record) {


if (StringUtils.isNotBlank(record.getMerchantName())) { if (StringUtils.isNotBlank(record.getMerchantName())) {
WxMerchant merchant = new WxMerchant(); WxMerchant merchant = new WxMerchant();
@@ -275,7 +275,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
} }


@Override @Override
public Map<String, Object> merchantSettlementStatistics(WxOfflineActivityGrantSettlement grantSettlement) {
public Map<String, Object> merchantSettlementStatistics(OfflineActivitySettlement grantSettlement) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
WxOfflineActivity activity = wxOfflineActivityMapper.selectById(grantSettlement.getActivityId(),grantSettlement.getTenantId()); WxOfflineActivity activity = wxOfflineActivityMapper.selectById(grantSettlement.getActivityId(),grantSettlement.getTenantId());
if(activity == null){ if(activity == null){
@@ -300,10 +300,10 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
}else{ }else{
OfflineActivitySettlement offlineActivitySettlement = activitySettlementList.get(0); OfflineActivitySettlement offlineActivitySettlement = activitySettlementList.get(0);
result.put("recordCount",offlineActivitySettlement.getRecordCount()); result.put("recordCount",offlineActivitySettlement.getRecordCount());
result.put("sumOrderMoney",offlineActivitySettlement.getRecordCount());
result.put("sumGrantPrice",offlineActivitySettlement.getRecordCount());
result.put("sumMallPrice",offlineActivitySettlement.getRecordCount());
result.put("sumMerchantPrice",offlineActivitySettlement.getRecordCount());
result.put("sumOrderMoney",offlineActivitySettlement.getSumOrderMoney());
result.put("sumGrantPrice",offlineActivitySettlement.getSumGrantPrice());
result.put("sumMallPrice",offlineActivitySettlement.getSumMallPrice());
result.put("sumMerchantPrice",offlineActivitySettlement.getSumMerchantPrice());
} }


return result; return result;


+ 7
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java Прегледај датотеку

@@ -109,8 +109,15 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
WxMerchant merchantQ = new WxMerchant(); WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(tenantEntity); merchantQ.updateTenantInfo(tenantEntity);
Map<Long, String> idAndNamesMap = wxMerchantService.getIdAndNamesMap(merchantQ); Map<Long, String> idAndNamesMap = wxMerchantService.getIdAndNamesMap(merchantQ);
MallUserInfo userInfoQ = new MallUserInfo();
userInfoQ.updateTenantInfo(tenantEntity);
Map<Long, MallUserInfo> userMap = mallUserInfoService.getUserMap(userInfoQ);

for (WxOfflineActivityRecord record : recordList) { for (WxOfflineActivityRecord record : recordList) {
record.setMerchantName(idAndNamesMap.get(record.getMerchantId())); record.setMerchantName(idAndNamesMap.get(record.getMerchantId()));
if(record.getAuditBy() != null){
record.setAuditByName(userMap.get(record.getAuditBy()).getName());
}
} }
} }




+ 1
- 9
mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml Прегледај датотеку

@@ -152,7 +152,7 @@
</select> </select>




<select id="getActivitySettlement" parameterType="com.iformall.domain.po.WxOfflineActivityGrantSettlement" resultType="com.iformall.domain.vo.OfflineActivitySettlement">
<select id="getActivitySettlement" parameterType="com.iformall.domain.vo.OfflineActivitySettlement" resultType="com.iformall.domain.vo.OfflineActivitySettlement">
SELECT merchant_id as 'merchantId', SELECT merchant_id as 'merchantId',
activity_id as 'activityId', activity_id as 'activityId',
count(record_id) as 'recordCount', count(record_id) as 'recordCount',
@@ -171,14 +171,6 @@
<if test=" null != parentTenantId and '' != parentTenantId"> <if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId} and `parent_tenant_id` = #{parentTenantId}
</if> </if>

<if test=" null != createDateBegin">
and `create_date` &gt;= #{createDateBegin}
</if>

<if test=" null != createDateEnd">
and `create_date` &lt;= #{createDateEnd}
</if>
<if test=" null != merchantId "> <if test=" null != merchantId ">
and `merchant_id` = #{merchantId} and `merchant_id` = #{merchantId}
</if> </if>


Loading…
Откажи
Сачувај