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

fix car pay

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
6361abcaf8
6 измененных файлов: 85 добавлений и 0 удалений
  1. +57
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCarPayOrderController.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java
  6. +14
    -0
      mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml

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

@@ -0,0 +1,57 @@
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.WxActivity;
import com.iformall.domain.po.WxCarPayOrder;
import com.iformall.enums.EnumActivityStatus;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxActivityService;
import com.iformall.service.park.pay.WxParkPayService;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("wxCarPayOrder")
@Api(description = "停车支付订单")
public class WxCarPayOrderController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private WxParkPayService wxParkPayService;

@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData list(@ModelAttribute WxCarPayOrder wxCarPayOrder, Integer pageNum, Integer pageSize) {
if (null == wxCarPayOrder) wxCarPayOrder = new WxCarPayOrder();
wxCarPayOrder.updateTenantInfo(getTenantInfo());
wxCarPayOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
final PageInfo<WxCarPayOrder> page = wxParkPayService.listPayOrderAsPage(wxCarPayOrder, pageNum, pageSize);
return new ResultData(page);
}
@ApiOperation("总和")
@GetMapping("sum")
public ResultData sum(@ModelAttribute WxCarPayOrder wxCarPayOrder) {
if (null == wxCarPayOrder) wxCarPayOrder = new WxCarPayOrder();
wxCarPayOrder.updateTenantInfo(getTenantInfo());
Integer total = wxParkPayService.sumCarPayOrder(wxCarPayOrder);
return new ResultData(total);
}

}

+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java Просмотреть файл

@@ -52,4 +52,9 @@ public class WxCarPayOrder extends TenantEntity {
@TableField(exist = false)
private Integer notifyCountLimit;
@TableField(exist = false)
private Date begin;
@TableField(exist = false)
private Date end;
}

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

@@ -15,4 +15,6 @@ public interface WxCarPayOrderMapper extends CommonMapper<WxCarPayOrder, Long> {
WxCarPayOrder findOneByParkOderNo(@Param("parkOrderNo")String parkOrderNo,@Param("tenantId")String tenantId);
Integer sum(WxCarPayOrder wxCarPayOrder);
}

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

@@ -24,5 +24,7 @@ public interface WxParkPayService {
Integer fee,Date paidTime,String transcationId,String merchantAccount,Long merchantId,String merchantName) throws Exception;

public WxCarPayOrder detailWxCarPayOrder(Long id,String tenantId);
public Integer sumCarPayOrder(WxCarPayOrder record);

}

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

@@ -248,4 +248,9 @@ public class WxParkPayServiceImpl implements WxParkPayService {
return wxCarPayOrderMapper.selectById(id, tenantId);
}

@Override
public Integer sumCarPayOrder(WxCarPayOrder record) {
return wxCarPayOrderMapper.sum(record);
}

}

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

@@ -95,6 +95,14 @@
and `car_vendor` &lt;= #{carVendor}
</if>
<if test=" null != begin ">
and `create_time` &gt;= #{begin}
</if>
<if test=" null != end ">
and `create_time` &lt;= #{end}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -120,5 +128,11 @@
<include refid="allColumns"/>
from wx_car_pay_order where tenant_id = #{tenantId} and `park_order_no` = #{parkOrderNo}
</select>
<select id="sum" parameterType="com.iformall.domain.po.WxCarPayOrder" resultType="Integer">
select sum(pay_amount)
from wx_car_pay_order
<include refid="dynamicWhereConditions"/>
</select>

</mapper>

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