|
|
@@ -23,6 +23,7 @@ import com.java110.dto.parking.ParkingSpaceDto;
|
|
|
import com.java110.dto.repair.RepairDto;
|
|
|
import com.java110.dto.repair.RepairUserDto;
|
|
|
import com.java110.dto.user.UserDto;
|
|
|
+import com.java110.fee.smo.impl.FeeReceiptInnerServiceSMOImpl;
|
|
|
import com.java110.intf.community.*;
|
|
|
import com.java110.intf.fee.*;
|
|
|
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
|
|
|
@@ -138,6 +139,11 @@ public class PayOweFeeCmd extends Cmd {
|
|
|
JSONObject feeObj = null;
|
|
|
String appId = dataFlowContext.getReqHeaders().get("app-id");
|
|
|
|
|
|
+
|
|
|
+ //todo 生成收据编号
|
|
|
+ String receiptCode = feeReceiptInnerServiceSMOImpl.generatorReceiptCode(paramObj.getString("communityId"));
|
|
|
+
|
|
|
+
|
|
|
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
|
|
|
feeObj = fees.getJSONObject(feeIndex);
|
|
|
feeObj.put("communityId", paramObj.getString("communityId"));
|
|
|
@@ -152,7 +158,7 @@ public class PayOweFeeCmd extends Cmd {
|
|
|
}
|
|
|
|
|
|
//todo 去缴费
|
|
|
- getFeeReceiptDetailPo(dataFlowContext, feeObj, feeReceiptDetailPos, feeReceiptPos, userDtos.get(0));
|
|
|
+ getFeeReceiptDetailPo(dataFlowContext, feeObj, feeReceiptDetailPos, feeReceiptPos, userDtos.get(0), receiptCode);
|
|
|
}
|
|
|
|
|
|
//这里只是写入 收据表,暂不考虑 事务一致性问题,就算写入失败 也只是影响 收据打印,如果 贵公司对 收据要求 比较高,不能有失败的情况 请加入事务管理
|
|
|
@@ -178,7 +184,7 @@ public class PayOweFeeCmd extends Cmd {
|
|
|
List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
|
|
|
|
|
|
JSONObject data = new JSONObject();
|
|
|
- data.put("receipts",feeReceiptDetailDtos);
|
|
|
+ data.put("receipts", feeReceiptDetailDtos);
|
|
|
|
|
|
dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(data));
|
|
|
}
|
|
|
@@ -186,7 +192,8 @@ public class PayOweFeeCmd extends Cmd {
|
|
|
private void getFeeReceiptDetailPo(ICmdDataFlowContext dataFlowContext, JSONObject paramObj,
|
|
|
List<FeeReceiptDetailPo> feeReceiptDetailPos,
|
|
|
List<FeeReceiptPo> feeReceiptPos,
|
|
|
- UserDto userDto) {
|
|
|
+ UserDto userDto,
|
|
|
+ String receiptCode) {
|
|
|
int flag = 0;
|
|
|
if (!paramObj.containsKey("primeRate")) {
|
|
|
paramObj.put("primeRate", "6");
|
|
|
@@ -202,7 +209,7 @@ public class PayOweFeeCmd extends Cmd {
|
|
|
}
|
|
|
paramObj.put("state", "1400");
|
|
|
// todo 添加交费明细
|
|
|
- addOweFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPos, feeReceiptPos, userDto);
|
|
|
+ addOweFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPos, feeReceiptPos, userDto, receiptCode);
|
|
|
modifyOweFee(paramObj, dataFlowContext);
|
|
|
|
|
|
//修改车辆
|
|
|
@@ -325,7 +332,8 @@ public class PayOweFeeCmd extends Cmd {
|
|
|
public void addOweFeeDetail(JSONObject paramInJson, ICmdDataFlowContext dataFlowContext,
|
|
|
List<FeeReceiptDetailPo> feeReceiptDetailPos,
|
|
|
List<FeeReceiptPo> feeReceiptPos,
|
|
|
- UserDto userDto) {
|
|
|
+ UserDto userDto,
|
|
|
+ String receiptCode) {
|
|
|
|
|
|
JSONObject businessFeeDetail = new JSONObject();
|
|
|
businessFeeDetail.putAll(paramInJson);
|
|
|
@@ -377,6 +385,7 @@ public class PayOweFeeCmd extends Cmd {
|
|
|
}
|
|
|
payFeeDetailPo.setCashierId(userDto.getUserId());
|
|
|
payFeeDetailPo.setCashierName(userDto.getName());
|
|
|
+ payFeeDetailPo.setReceiptCode(receiptCode);
|
|
|
|
|
|
int flag = payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
|
|
|
|