|
|
|
@ -198,7 +198,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
|
|
|
|
|
List<JSONObject> bdSaleList = bdAnalysisMapper.getOneDayBDSaleList(params);
|
|
|
|
|
if (bdSaleList.size() != 0) {
|
|
|
|
|
for (JSONObject item : bdSaleList) {
|
|
|
|
|
JSONObject existBDSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("bd_id"),beginTime,0);
|
|
|
|
|
JSONObject existBDSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("org_id"),item.getString("bd_id"),beginTime,0);
|
|
|
|
|
if(existBDSalesReport==null){
|
|
|
|
|
JSONObject object = new JSONObject(item);
|
|
|
|
|
object.put("log_id", UUID.randomUUID().toString());
|
|
|
|
@ -216,7 +216,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
|
|
|
|
|
List<JSONObject> orgSaleList= transactionAnalysisMapper.getOneDayOrgMerchantSaleList(params);
|
|
|
|
|
if (orgSaleList.size() != 0) {
|
|
|
|
|
for (JSONObject item : orgSaleList) {
|
|
|
|
|
JSONObject existOrgSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("bd_id"),beginTime,1);
|
|
|
|
|
JSONObject existOrgSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("org_id"),item.getString("bd_id"),beginTime,1);
|
|
|
|
|
if(existOrgSalesReport==null){
|
|
|
|
|
JSONObject object = new JSONObject(item);
|
|
|
|
|
object.put("log_id", UUID.randomUUID().toString());
|
|
|
|
|