| @@ -48,6 +48,7 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ | |||||
| valueMap.put("beginTime", DateUtils.format(record.getBeginTime())); | valueMap.put("beginTime", DateUtils.format(record.getBeginTime())); | ||||
| valueMap.put("endTime", DateUtils.format(record.getEndTime())); | valueMap.put("endTime", DateUtils.format(record.getEndTime())); | ||||
| valueMap.put("confirmTime", DateUtils.format(new Date())); | valueMap.put("confirmTime", DateUtils.format(new Date())); | ||||
| valueMap.put("merchantId", record.getMerchantId()); | |||||
| valueMap.put("merchantName", record.getMerchantName()); | valueMap.put("merchantName", record.getMerchantName()); | ||||
| valueMap.put("merchantCode", record.getMerchantCode()); | valueMap.put("merchantCode", record.getMerchantCode()); | ||||
| valueMap.put("merchantPerson", record.getMerchantPerson()); | valueMap.put("merchantPerson", record.getMerchantPerson()); | ||||
| @@ -150,4 +150,12 @@ public class PriceUtilV2 { | |||||
| } | } | ||||
| return sb.toString(); | return sb.toString(); | ||||
| } | } | ||||
| public static void main(String[] args) { | |||||
| //BigDecimal numberOfMoney = new BigDecimal(432342341231.906); | |||||
| //BigDecimal numberOfMoney = new BigDecimal(1500.100); | |||||
| BigDecimal numberOfMoney = new BigDecimal(20000.000); | |||||
| System.out.println(numberOfMoney.toString()); | |||||
| System.out.println(number2CNMontrayUnit(numberOfMoney)); | |||||
| } | |||||
| } | } | ||||
| @@ -80,11 +80,11 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != begin"> | <if test=" null != begin"> | ||||
| and `begin_time` <= #{begin} | |||||
| and `begin_time` >= #{begin} | |||||
| </if> | </if> | ||||
| <if test=" null != end"> | <if test=" null != end"> | ||||
| and `end_time` >= #{end} | |||||
| and `end_time` <= #{end} | |||||
| </if> | </if> | ||||
| <if test=" null != merchantName and merchantName != '' "> | <if test=" null != merchantName and merchantName != '' "> | ||||
| @@ -100,7 +100,7 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != isDel"> | <if test=" null != isDel"> | ||||
| and `is_del` >= #{isDel} | |||||
| and `is_del` = #{isDel} | |||||
| </if> | </if> | ||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||