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

[修改][结算单][修改跳点率计算]

release_toaliyun_real
luozukai пре 6 година
родитељ
комит
21a7b6782c
2 измењених фајлова са 11 додато и 4 уклоњено
  1. +8
    -1
      mallinkAdmin/src/test/java/com/iformall/service/test/Test.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 8
- 1
mallinkAdmin/src/test/java/com/iformall/service/test/Test.java Прегледај датотеку

@@ -9,6 +9,7 @@ import com.iformall.mapper.WxBillSettleMapper;
import com.iformall.mq.MqBaseProducer; import com.iformall.mq.MqBaseProducer;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
import com.iformall.utils.JsonUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.UsernamePasswordToken;
@@ -142,5 +143,11 @@ public class Test {
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
} }



@org.junit.Test
public void testmq2(){
WxBillAll wxBillAll = new WxBillAll();
wxBillAll.setTenantId("456");
wxBillAll.setMerchantId(324754110547066880l);
System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll)));
}
} }

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

@@ -196,13 +196,13 @@ public class WxBillAllServiceImpl implements WxBillAllService {
} }
List<Map<String, Object>> maps = wxBillAllMapper.listData(wxBillAll); List<Map<String, Object>> maps = wxBillAllMapper.listData(wxBillAll);
for (Map<String, Object> map:maps) { for (Map<String, Object> map:maps) {
Integer billType = (Integer)map.get("billTypeValue");
Integer billType = ((Long)map.get("billTypeValue")).intValue();
if(EnumBillType.SETTLE.getCode().equals(billType)){ if(EnumBillType.SETTLE.getCode().equals(billType)){
Long rp = (Long)map.get("receive_pay");
BigDecimal rp = (BigDecimal)map.get("receivePay");
WxBillSettle query = new WxBillSettle(); WxBillSettle query = new WxBillSettle();
query.setId((Long)map.get("id")); query.setId((Long)map.get("id"));
Long sum = wxBillSettleRecordMapper.getSumMoneyBySettleId(query); Long sum = wxBillSettleRecordMapper.getSumMoneyBySettleId(query);
map.put("owe",rp-sum);
map.put("owe",rp.subtract(new BigDecimal(sum)));
} }
} }
return new ResultData(maps); return new ResultData(maps);


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