diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java
index 8e9297e7a..d4a2dee32 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java
@@ -48,6 +48,7 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{
valueMap.put("beginTime", DateUtils.format(record.getBeginTime()));
valueMap.put("endTime", DateUtils.format(record.getEndTime()));
valueMap.put("confirmTime", DateUtils.format(new Date()));
+ valueMap.put("merchantId", record.getMerchantId());
valueMap.put("merchantName", record.getMerchantName());
valueMap.put("merchantCode", record.getMerchantCode());
valueMap.put("merchantPerson", record.getMerchantPerson());
diff --git a/mallinkService/src/main/java/com/iformall/utils/PriceUtilV2.java b/mallinkService/src/main/java/com/iformall/utils/PriceUtilV2.java
index 3a9a4db38..0675e6167 100644
--- a/mallinkService/src/main/java/com/iformall/utils/PriceUtilV2.java
+++ b/mallinkService/src/main/java/com/iformall/utils/PriceUtilV2.java
@@ -150,4 +150,12 @@ public class PriceUtilV2 {
}
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));
+ }
}
\ No newline at end of file
diff --git a/mallinkService/src/main/resources/mapper/WxSettleMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxSettleMerchantMapper.xml
index 24f4c9f3a..2d12ad1a0 100644
--- a/mallinkService/src/main/resources/mapper/WxSettleMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxSettleMerchantMapper.xml
@@ -80,11 +80,11 @@
- and `begin_time` <= #{begin}
+ and `begin_time` >= #{begin}
- and `end_time` >= #{end}
+ and `end_time` <= #{end}
@@ -100,7 +100,7 @@
- and `is_del` >= #{isDel}
+ and `is_del` = #{isDel}