|
|
|
@@ -1449,10 +1449,16 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
if (null != shopMap) { |
|
|
|
shop = shopMap.get(result.getShopId()); |
|
|
|
} |
|
|
|
if (null == shop) { |
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺ID["+result.getShopId()+"]未查询到店铺"); |
|
|
|
} |
|
|
|
WxMerchant merchant = null; |
|
|
|
if (null != merchantMap) { |
|
|
|
merchant = merchantMap.get(result.getShopId()); |
|
|
|
} |
|
|
|
if (null == merchant) { |
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺"+shop.getShopNumber()+"未绑定商户,请先绑定商户"); |
|
|
|
} |
|
|
|
WxAllBill bill = result.generateBill(calcute, merchant, shop, user, result.getMoney(), result.getMoneyDeail(), "能源计算自动生成"); |
|
|
|
billList.add(bill); |
|
|
|
} |
|
|
|
|