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

[审批流][添加][账单审批]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
bbd70ccaf1
7 измененных файлов: 33 добавлений и 3 удалений
  1. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/WxTopicService.java
  5. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
  6. +7
    -0
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  7. +0
    -1
      mallinkService/src/main/resources/mapper/WxTopicMapper.xml

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

@@ -32,6 +32,14 @@ public class WxTopicController extends BaseController {
return new ResultData(page); return new ResultData(page);
} }


@GetMapping("findById")
public ResultData findById(WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::findById");
String tenantId = getTenantId();
wxTopic.setTenantId(tenantId);
return new ResultData(wxTopicService.findById(wxTopic));
}

@PostMapping("saveOrUpdate") @PostMapping("saveOrUpdate")
public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) { public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate"); logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate");


+ 4
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.mapper;


import java.util.*; import java.util.*;
import com.iformall.common.CommonMapper; import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxTopic;
import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponCVo;
import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxCouponStatisVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@@ -64,4 +65,7 @@ public interface WxCouponMapper extends CommonMapper<WxCoupon, Long> {
List<WxCouponStatisVo> pressPaymentHistory(WxCoupon wxCoupon); List<WxCouponStatisVo> pressPaymentHistory(WxCoupon wxCoupon);
String pressSuccRate(WxCoupon wxCoupon); String pressSuccRate(WxCoupon wxCoupon);
Long sumJoin(WxCoupon wxCoupon); Long sumJoin(WxCoupon wxCoupon);


List<WxCoupon> findCouponByTopic(WxTopic wxTopic);
} }

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.mapper; package com.iformall.mapper;


import com.iformall.common.CommonMapper; import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxTopic; import com.iformall.domain.po.WxTopic;
import java.util.List; import java.util.List;


@@ -9,4 +10,5 @@ public interface WxTopicMapper extends CommonMapper<WxTopic, String> {
List<WxTopic> findList(WxTopic wxTopic); List<WxTopic> findList(WxTopic wxTopic);


WxTopic show(WxTopic record); WxTopic show(WxTopic record);

} }

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

@@ -19,6 +19,6 @@ public interface WxTopicService {
ResultData saveOrUpdate(WxTopic record); ResultData saveOrUpdate(WxTopic record);


WxTopic show(WxTopic record); WxTopic show(WxTopic record);
WxTopic findById(WxTopic record);
} }

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

@@ -8,6 +8,7 @@ import com.iformall.common.IdWorker;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.domain.po.WxCouponTopic; import com.iformall.domain.po.WxCouponTopic;
import com.iformall.domain.po.WxTopic; import com.iformall.domain.po.WxTopic;
import com.iformall.mapper.WxCouponMapper;
import com.iformall.mapper.WxCouponTopicMapper; import com.iformall.mapper.WxCouponTopicMapper;
import com.iformall.mapper.WxTopicMapper; import com.iformall.mapper.WxTopicMapper;
import com.iformall.service.WxTopicService; import com.iformall.service.WxTopicService;
@@ -27,6 +28,8 @@ public class WxTopicServiceImpl implements WxTopicService {
private WxTopicMapper wxTopicMapper; private WxTopicMapper wxTopicMapper;
@Autowired @Autowired
private WxCouponTopicMapper wxCouponTopicMapper; private WxCouponTopicMapper wxCouponTopicMapper;
@Autowired
private WxCouponMapper wxCouponMapper;


@Override @Override
public PageInfo<WxTopic> listAsPage(WxTopic record, Integer pageIndex, Integer pageSize) { public PageInfo<WxTopic> listAsPage(WxTopic record, Integer pageIndex, Integer pageSize) {
@@ -89,4 +92,11 @@ public class WxTopicServiceImpl implements WxTopicService {
wxCouponTopicMapper.insertSelective(couponTopic); wxCouponTopicMapper.insertSelective(couponTopic);
} }
} }

@Override
public WxTopic findById(WxTopic record) {
WxTopic wxTopic = wxTopicMapper.selectByPrimaryKey(record.getId());
wxTopic.setCouponList(wxCouponMapper.findCouponByTopic(record));
return wxTopic;
}
} }

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

@@ -717,4 +717,11 @@
where wc.type = 8 where wc.type = 8
and wop.create_date between #{startdate} and #{enddate} and wop.create_date between #{startdate} and #{enddate}
</select> </select>

<select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" resultType="com.iformall.domain.po.WxCoupon">
select wc.* from wx_coupon wc left join wx_coupon_topic wct on wct.`bus_id` = wc.id
left join wx_topic wt on wct.`topic_id` = wt.id
where wt.id = #{id}
</select>

</mapper> </mapper>

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

@@ -54,5 +54,4 @@
</select> </select>





</mapper> </mapper>

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