|
@@ -129,7 +129,7 @@ public class RocketSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChai
|
|
supplyChain.setServiceAmount(jsonObject.getLong("serviceAmount"));
|
|
supplyChain.setServiceAmount(jsonObject.getLong("serviceAmount"));
|
|
supplyChain.setRegimentalPromotionAmount(jsonObject.getLong("regimentalPromotionAmount"));
|
|
supplyChain.setRegimentalPromotionAmount(jsonObject.getLong("regimentalPromotionAmount"));
|
|
supplyChain.setTotalRegimentalSettleAmount(jsonObject.getLong("totalRegimentalSettleAmount"));
|
|
supplyChain.setTotalRegimentalSettleAmount(jsonObject.getLong("totalRegimentalSettleAmount"));
|
|
- supplyChain.setStatDate(DateUtils.tempToDate(jsonObject.getLong("orderCreateTime")));
|
|
|
|
|
|
+ supplyChain.setStatDate(DateUtils.tempToDateLong(jsonObject.getLong("orderCreateTime")));
|
|
supplyChain.setStatHour(DateUtils.getHour(jsonObject.getLong("orderCreateTime")));
|
|
supplyChain.setStatHour(DateUtils.getHour(jsonObject.getLong("orderCreateTime")));
|
|
supplyChain.setItemCommissionRate(itemMap.get(item.getLong("itemId")));
|
|
supplyChain.setItemCommissionRate(itemMap.get(item.getLong("itemId")));
|
|
Criteria criteria = new Criteria();
|
|
Criteria criteria = new Criteria();
|