Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
2e6006200c
6 changed files with 43 additions and 1 deletions
  1. +29
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityRecordMapper.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java
  6. +5
    -0
      mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml

+ 29
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java View File

@@ -349,4 +349,33 @@ public class WxCashBackActivityController extends BaseController {
}
return new ResultData(result);
}
@ApiOperation("查询当前提现信息")
@GetMapping("merchantActivityRecordCount")
public ResultData recordCount(@ModelAttribute WxCashBackActivityRecord wxCashBackActivityRecord) {
if (null == wxCashBackActivityRecord.getMerchantId() || null == wxCashBackActivityRecord.getActivityId()) {
return new ResultData(Result.ERROR,"参数错误");
}
TenantEntity tenantInfo = getTenantInfo();
WxCashBackActivity a = wxCashBackActivityService.getActivityById(wxCashBackActivityRecord.getActivityId(), tenantInfo.getTenantId());
if (null == a) {
return new ResultData(Result.ERROR,"参数错误");
}
WxCashBackActivityRecord r = new WxCashBackActivityRecord();
r.setActivityId(a.getId());
r.updateTenantInfo(a);
r.setMerchantId(wxCashBackActivityRecord.getMerchantId());
int allRecordCount = wxCashBackActivityService.getRecordCount(r);
BigDecimal orderMoneySum = wxCashBackActivityService.getRecordOrderMoneySum(r);
BigDecimal recordSum = wxCashBackActivityService.getRecordSum(r);
BigDecimal merchantRecordSum = wxCashBackActivityService.getRecordMerchantSum(r);
Map retMap = new HashMap();
retMap.put("allRecordCount", allRecordCount);
retMap.put("orderMoneySum", orderMoneySum);
retMap.put("recordSum", recordSum);
retMap.put("merchantRecordSum", merchantRecordSum);
return new ResultData(retMap);
}
}

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java View File

@@ -143,7 +143,7 @@ public class WxCashBackActivityController extends BaseController {
TenantEntity tenantInfo = getTenantInfo();
WxCashBackActivity a = wxCashBackActivityService.getActivityById(wxCashBackActivityRecord.getActivityId(), tenantInfo.getTenantId());
if (null == a) {
return new ResultData();
return new ResultData(Result.ERROR,"参数错误");
}
WxCashBackActivityRecord r = new WxCashBackActivityRecord();
r.setActivityId(a.getId());


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityRecordMapper.java View File

@@ -23,6 +23,8 @@ public interface WxCashBackActivityRecordMapper extends CommonMapper<WxCashBackA
BigDecimal sumMerchant(WxCashBackActivityRecord wxCashBackActivity);
BigDecimal sumOrderMoney(WxCashBackActivityRecord wxCashBackActivity);
List<Map> selectMerchantRecords(WxCashBackActivityRecord wxCashBackActivity);

}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java View File

@@ -34,6 +34,7 @@ public interface WxCashBackActivityService {
int getRecordCount(WxCashBackActivityRecord record);
BigDecimal getRecordSum(WxCashBackActivityRecord record);
BigDecimal getRecordMerchantSum(WxCashBackActivityRecord record);
BigDecimal getRecordOrderMoneySum(WxCashBackActivityRecord record);
List<Map> getMerchantRecords(WxCashBackActivityRecord record);
int getMerchantCount(WxCashBackActivity record);


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java View File

@@ -244,6 +244,11 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService
public BigDecimal getRecordMerchantSum(WxCashBackActivityRecord record) {
return wxCashBackActivityRecordMapper.sumMerchant(record);
}
@Override
public BigDecimal getRecordOrderMoneySum(WxCashBackActivityRecord record) {
return wxCashBackActivityRecordMapper.sumOrderMoney(record);
}

@Override
public int getMerchantCount(WxCashBackActivity record) {


+ 5
- 0
mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml View File

@@ -159,6 +159,11 @@
<include refid="dynamicWhereConditions" />
</select>
<select id="sumOrderMoney" parameterType="com.iformall.domain.po.WxCashBackActivityRecord" resultType="BigDecimal">
select sum(order_money) from wx_cash_back_activity_record
<include refid="dynamicWhereConditions" />
</select>
<select id="selectMerchantRecords" parameterType="com.iformall.domain.po.WxCashBackActivityRecord" resultType="java.util.HashMap">
select merchant_id as merchantId,count(1) as orderCount,sum(order_money) as orderMoney, sum(cash_money) as allMoney,sum(merchant_cash_money) as merchantMenoy from wx_cash_back_activity_record
<include refid="dynamicWhereConditions" />


Loading…
Cancel
Save