Просмотр исходного кода

//OfflineActivity

release_toaliyun_real
xiaohu 1 год назад
Родитель
Сommit
2f9f88b5f0
4 измененных файлов: 60 добавлений и 0 удалений
  1. +19
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java
  3. +35
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java
  4. +3
    -0
      mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml

+ 19
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java Просмотреть файл

@@ -98,6 +98,25 @@ public class WxOfflineActivitySettlementController extends BaseController {
return new ResultData(recordList); return new ResultData(recordList);
} }


@ApiOperation("单个活动单个门店结算汇总")
@GetMapping("merchantSettlementStatistics")
@ApiImplicitParams({})
public ResultData merchantSettlementStatistics(@ModelAttribute WxOfflineActivityGrantSettlement grantSettlement) {

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

TenantEntity tenantInfo = getTenantInfo();
grantSettlement.updateTenantInfo(tenantInfo);
Map<String,Object> recordList = wxOfflineActivityGrantSettlementService.merchantSettlementStatistics(grantSettlement);

return new ResultData(recordList);
}

@ApiOperation("单个活动单个门店结算列表") @ApiOperation("单个活动单个门店结算列表")
@GetMapping("merchantSettlement") @GetMapping("merchantSettlement")
@ApiImplicitParams({}) @ApiImplicitParams({})


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java Просмотреть файл

@@ -28,7 +28,10 @@ public interface WxOfflineActivityGrantSettlementService {


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


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

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


void exportData(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityGrantSettlement grantSettlement); void exportData(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityGrantSettlement grantSettlement);

} }

+ 35
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java Просмотреть файл

@@ -258,6 +258,41 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
return activitySettlementList; return activitySettlementList;
} }


@Override
public Map<String, Object> merchantSettlementStatistics(WxOfflineActivityGrantSettlement grantSettlement) {
Map<String, Object> result = new HashMap<>();
WxOfflineActivity activity = wxOfflineActivityMapper.selectById(grantSettlement.getActivityId(),grantSettlement.getTenantId());
if(activity == null){
result.put("activityName","查无此活动");
}else{
result.put("activityName",activity.getName());
}
WxMerchant merchant = wxMerchantMapper.selectById(grantSettlement.getMerchantId());
if(merchant == null){
result.put("merchantName","查无此门店");
}else{
result.put("merchantName",merchant.getName());
}
List<OfflineActivitySettlement> activitySettlementList = wxOfflineActivityGrantSettlementMapper.getActivitySettlement(grantSettlement);
if (activitySettlementList != null && !activitySettlementList.isEmpty()) {
result.put("recordCount",0);
result.put("sumOrderMoney",0);
result.put("sumGrantPrice",0);
result.put("sumMallPrice",0);
result.put("sumMerchantPrice",0);
return result;
}else{
OfflineActivitySettlement offlineActivitySettlement = activitySettlementList.get(0);
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());
}

return result;
}

@Override @Override
public List<WxOfflineActivityGrantSettlement> findList(WxOfflineActivityGrantSettlement grantSettlement) { public List<WxOfflineActivityGrantSettlement> findList(WxOfflineActivityGrantSettlement grantSettlement) {
return wxOfflineActivityGrantSettlementMapper.findList(grantSettlement); return wxOfflineActivityGrantSettlementMapper.findList(grantSettlement);


+ 3
- 0
mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml Просмотреть файл

@@ -179,6 +179,9 @@
<if test=" null != createDateEnd"> <if test=" null != createDateEnd">
and `create_date` &lt;= #{createDateEnd} and `create_date` &lt;= #{createDateEnd}
</if> </if>
<if test=" null != merchantId ">
and `merchant_id` = #{merchantId}
</if>
<if test=" null != merchantIdList "> <if test=" null != merchantIdList ">
and merchant_id in and merchant_id in
<foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")"> <foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")">


Загрузка…
Отмена
Сохранить