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

[合同][修改][开发联营跳点设置]

release_toaliyun_real
luozukai пре 6 година
родитељ
комит
4339f41cc9
4 измењених фајлова са 50 додато и 12 уклоњено
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java
  2. +20
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  3. +7
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +21
    -0
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java Прегледај датотеку

@@ -14,4 +14,6 @@ public interface WxMerchantTradeDailyMapper extends CommonMapper<WxMerchantTrade
List<WxMerchantTradeDailyVo> findVoList(WxMerchantTradeDaily wxMerchantTradeDaily);

List<WxMerchantTradeDaily> findTotalListOfMonth(WxMerchantTradeDaily wxMerchantTradeDaily);

String findSumMoney(WxMerchantTradeDaily wxMerchantTradeDaily);
}

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

@@ -11,10 +11,7 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillActionMapper;
import com.iformall.mapper.WxBillDepositMapper;
import com.iformall.mapper.WxBillRentMapper;
import com.iformall.mapper.WxRentContractMapper;
import com.iformall.mapper.*;
import com.iformall.service.ExcelService;
import com.iformall.service.WxBillActionService;
import com.iformall.service.WxBillRentService;
@@ -63,6 +60,9 @@ public class WxBillRentServiceImpl implements WxBillRentService {
@Autowired
WxRentContractMapper wxRentContractMapper;

@Autowired
WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper;

@Override
public PageInfo<WxBillRent> listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize) {
PageHelper.startPage(pageIndex, pageSize);
@@ -249,6 +249,13 @@ public class WxBillRentServiceImpl implements WxBillRentService {
Map<String, Object> result = new HashMap<>(3);
result.put("rent", rent);
result.put("deposit", deposit);

//解单金额
WxBillRent billRent = wxBillRentMapper.selectByPrimaryKey(id);
WxMerchantTradeDaily merchantTradeDaily = new WxMerchantTradeDaily();
merchantTradeDaily.setMerchantId(billRent.getMerchantId());
String money = wxMerchantTradeDailyMapper.findSumMoney(merchantTradeDaily);
result.put("solutionBillMoney", StringUtils.isBlank(money)?0:money);
return result;
}

@@ -313,9 +320,8 @@ public class WxBillRentServiceImpl implements WxBillRentService {
return 0;
}


@Transactional(rollbackFor = {Exception.class})
@Override
@Transactional(rollbackFor = {Exception.class})
public ResultData updateRevenue(WxBillRent record, MallUserInfo user) {
WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(record.getId());
WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxBillRent.getRentContractId());
@@ -361,12 +367,15 @@ public class WxBillRentServiceImpl implements WxBillRentService {
wxBillRent.setRevenue(record.getRevenue());
//wxBillRent.setReceivePay(oldPrice.equals(newPrice) ? oldPrice : newPrice);
wxBillRent.setUpdatetime(new Date());
try {
wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent);
} catch (Exception e) {
logger.error("修改营业额失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "修改营业额失败");

//如果在跳点区间中,修改扣点率
wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent);
if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){
wxRentContract.setPayRatio(ratio);
wxRentContract.setUpdatetime(new Date());
wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract);
}

if (!oldPrice.equals(newPrice)) {
//日志
WxBillAction wxBillAction = new WxBillAction();


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

@@ -254,7 +254,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
* @param record
*/
public void getPayRatio(WxRentContract record){
if(record.getPayRatio() != null){
if(record.getPayRatio() != null && record.getPayRatio().intValue() >0){
return;
}
if(StringUtils.isBlank(record.getBusDiscountRatio())){
return;
}
BigDecimal revenue = new BigDecimal(record.getRevenue()).divide(new BigDecimal(1000000)).setScale(4, RoundingMode.HALF_EVEN);
@@ -525,6 +528,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (wxRentContract == null) {
return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND);
}
wxRentContract.setBusDiscountTime(record.getBusDiscountTime());
wxRentContract.setBusDiscountRatio(record.getBusDiscountRatio());

int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;

Calendar instance = Calendar.getInstance();


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

@@ -146,6 +146,27 @@
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</select>

<select id="findSumMoney" parameterType="com.iformall.domain.po.WxMerchantTradeDaily" resultType="String">
select round(sum(mtd.trade_amt)/100,2)
from wx_merchant_trade_daily mtd
inner join wx_merchant m on mtd.merchant_id = m.id
left join wx_merchant_b_user mbu on mtd.b_user_id = mbu.id
where 1 = 1

<if test=" null != tenantId ">
and mtd.tenant_id = #{tenantId}
</if>

<if test=" null != merchantId ">
and mtd.merchant_id = #{merchantId}
</if>

<if test=" null != startTime and null != endTime">
and mtd.report_date &gt;= date_format(#{startTime},'%Y-%m-%d')
and mtd.report_date &lt;= date_format(#{endTime},'%Y-%m-%d')
</if>
</select>


<resultMap id="BaseTotalResultMap" type="com.iformall.domain.po.WxMerchantTradeDaily">
<result column="trade_amt" jdbcType="DECIMAL" property="tradeAmt" />


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