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

[储值卡][新增]:补贴汇总及添加开始/结束时间

release_toaliyun_real
Stormeye Wu пре 7 година
родитељ
комит
7ede738f9a
5 измењених фајлова са 42 додато и 4 уклоњено
  1. +14
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java
  2. +1
    -4
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java
  3. +8
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java
  4. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java
  5. +12
    -0
      mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml

+ 14
- 0
mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java Прегледај датотеку

@@ -14,6 +14,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.Map;

@RestController @RestController
@RequestMapping("subsidy") @RequestMapping("subsidy")
public class WxMerchantSubsidyController extends BaseController { public class WxMerchantSubsidyController extends BaseController {
@@ -22,6 +24,18 @@ public class WxMerchantSubsidyController extends BaseController {
@Autowired @Autowired
WxMerchantSubsidyService wxMerchantSubsidyService; WxMerchantSubsidyService wxMerchantSubsidyService;


@ApiOperation("补贴记录汇总")
@GetMapping("sum")
public ResultData count(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy) {
String ipStr = getIpAddr();
logger.info("subsidysum: " + ipStr + " :" + wxMerchantSubsidy.toString());
if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy();
MallUserInfo user = getUser();
wxMerchantSubsidy.setTenantId(user.getTenantId());
Map retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy);
return new ResultData(retMap);
}

@ApiOperation("补贴记录") @ApiOperation("补贴记录")
@GetMapping("list") @GetMapping("list")
@ApiImplicitParams({ @ApiImplicitParams({


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

@@ -10,10 +10,7 @@ public interface WxMerchantSubsidyMapper extends CommonMapper<WxMerchantSubsidy,
List<WxMerchantSubsidy> findList(WxMerchantSubsidy wxMerchantSubsidy); List<WxMerchantSubsidy> findList(WxMerchantSubsidy wxMerchantSubsidy);


List<WxMerchantSubsidyVo> findVoList(WxMerchantSubsidy wxMerchantSubsidy); List<WxMerchantSubsidyVo> findVoList(WxMerchantSubsidy wxMerchantSubsidy);


Map<String, Object> sumVoList(WxMerchantSubsidy wxMerchantSubsidy);
} }

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

@@ -4,8 +4,16 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxMerchantSubsidy; import com.iformall.domain.po.WxMerchantSubsidy;
import com.iformall.domain.vo.WxMerchantSubsidyVo; import com.iformall.domain.vo.WxMerchantSubsidyVo;


import java.util.Map;

public interface WxMerchantSubsidyService { public interface WxMerchantSubsidyService {


/**
* 汇总计算
* @param record
* @return
*/
Map<String, Object> sumForSubsidy(WxMerchantSubsidy record);
/** /**
* 根据实体查询分页列表 * 根据实体查询分页列表
* *


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

@@ -10,12 +10,19 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


import java.util.Map;

@Service @Service
public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService {
@Autowired @Autowired
WxMerchantSubsidyMapper wxMerchantSubsidyMapper; WxMerchantSubsidyMapper wxMerchantSubsidyMapper;


@Override
public Map<String, Object> sumForSubsidy(WxMerchantSubsidy record) {
return wxMerchantSubsidyMapper.sumVoList(record);
}



@Override @Override
public PageInfo<WxMerchantSubsidyVo> listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize) { public PageInfo<WxMerchantSubsidyVo> listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize) {


+ 12
- 0
mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml Прегледај датотеку

@@ -180,6 +180,18 @@
left join wx_merchant m on m.id = ms.merchant_id left join wx_merchant m on m.id = ms.merchant_id
<include refid="dynamicVoWhereConditions" /> <include refid="dynamicVoWhereConditions" />
</select> </select>

<select id="sumVoList" parameterType="com.iformall.domain.po.WxMerchantSubsidy" resultType="hashmap">
select IFNULL(sum(ms.`order_payment`),0) as sum_order_payment,
IFNULL(sum(ms.`receiver_payment`),0) as sum_receiver_payment,
IFNULL(sum(ms.`subsidy`),0) as sum_subsidy,
IFNULL(sum(ms.`real_subsidy`),0) as sum_real_subsidy
from wx_merchant_subsidy ms
left join wx_coupon_order co on co.id = ms.coupon_order_id
left join wx_coupon c on c.id = co.coupon_id
left join wx_merchant m on m.id = ms.merchant_id
<include refid="dynamicVoWhereConditions" />
</select>


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