Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 1 anno fa
parent
commit
5a938f650a
10 ha cambiato i file con 590 aggiunte e 8 eliminazioni
  1. +14
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +503
    -0
      mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql
  3. +17
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceivePayway.java
  6. +37
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumFinanceCashierType.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  8. +2
    -1
      mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml
  9. +5
    -2
      mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml
  10. +4
    -3
      mallinkService/src/main/resources/mapper/WxFinanceReceivePaywayMapper.xml

+ 14
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Vedi File

@@ -218,6 +218,20 @@ public class WxFinanceController extends BaseController {
return new ResultData(list);
}
@ApiOperation("新增付款单")
@PostMapping("createPay")
public ResultData createPay(@RequestBody WxFinanceReceive record) {
record.updateTenantInfo(getTenantInfo());
if (null == record.getMerchantId()) {
return new ResultData(Result.ERROR,"请选择商户");
}
if (null == record.getBills() || null == record.getPayWays()) {
return new ResultData(Result.ERROR,"请选择账单和支付方式");
}
List<WxAllBill> list = wxFinanceService.createReceive(record,this.getUser());
return new ResultData(list);
}
@GetMapping("receiveStatus")
public ResultData receiveStatus() {
List<Map> list = new ArrayList<Map>();


+ 503
- 0
mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql Vedi File

@@ -167,5 +167,508 @@ CREATE TABLE `wx_finance_print_template` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='租赁合同';

alter table wx_finance_receive_0 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_1 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_2 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_3 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_4 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_5 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_6 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_7 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_8 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_9 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_10 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_11 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_12 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_13 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_14 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_15 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_16 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_17 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_18 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_19 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_20 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_21 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_22 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_23 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_24 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_25 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_26 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_27 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_28 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_29 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_30 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_31 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_32 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_33 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_34 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_35 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_36 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_37 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_38 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_39 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_40 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_41 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_42 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_43 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_44 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_45 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_46 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_47 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_48 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_49 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_50 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_51 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_52 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_53 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_54 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_55 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_56 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_57 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_58 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_59 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_60 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_61 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_62 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_63 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_64 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_65 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_66 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_67 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_68 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_69 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_70 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_71 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_72 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_73 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_74 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_75 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_76 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_77 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_78 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_79 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_80 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_81 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_82 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_83 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_84 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_85 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_86 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_87 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_88 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_89 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_90 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_91 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_92 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_93 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_94 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_95 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_96 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_97 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_98 CHANGE `type` receive_type INT(1);
alter table wx_finance_receive_99 CHANGE `type` receive_type INT(1);

alter table wx_finance_receive_0 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_1 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_2 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_3 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_4 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_5 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_6 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_7 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_8 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_9 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_10 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_11 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_12 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_13 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_14 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_15 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_16 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_17 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_18 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_19 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_20 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_21 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_22 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_23 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_24 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_25 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_26 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_27 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_28 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_29 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_30 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_31 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_32 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_33 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_34 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_35 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_36 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_37 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_38 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_39 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_40 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_41 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_42 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_43 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_44 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_45 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_46 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_47 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_48 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_49 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_50 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_51 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_52 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_53 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_54 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_55 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_56 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_57 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_58 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_59 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_60 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_61 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_62 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_63 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_64 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_65 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_66 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_67 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_68 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_69 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_70 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_71 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_72 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_73 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_74 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_75 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_76 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_77 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_78 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_79 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_80 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_81 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_82 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_83 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_84 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_85 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_86 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_87 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_88 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_89 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_90 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_91 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_92 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_93 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_94 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_95 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_96 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_97 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_98 add column type int(1) not null comment '出纳类型';;
alter table wx_finance_receive_99 add column type int(1) not null comment '出纳类型';;

alter table wx_finance_receive_0 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_1 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_2 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_3 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_4 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_5 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_6 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_7 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_8 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_9 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_10 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_11 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_12 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_13 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_14 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_15 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_16 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_17 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_18 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_19 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_20 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_21 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_22 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_23 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_24 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_25 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_26 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_27 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_28 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_29 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_30 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_31 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_32 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_33 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_34 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_35 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_36 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_37 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_38 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_39 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_40 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_41 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_42 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_43 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_44 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_45 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_46 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_47 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_48 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_49 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_50 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_51 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_52 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_53 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_54 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_55 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_56 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_57 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_58 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_59 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_60 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_61 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_62 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_63 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_64 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_65 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_66 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_67 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_68 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_69 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_70 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_71 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_72 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_73 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_74 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_75 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_76 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_77 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_78 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_79 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_80 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_81 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_82 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_83 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_84 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_85 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_86 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_87 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_88 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_89 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_90 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_91 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_92 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_93 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_94 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_95 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_96 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_97 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_98 add column pay_money varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_99 add column pay_money varchar(30) comment '支付给商户金额';

alter table wx_finance_receive_bill_0 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_1 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_2 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_3 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_4 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_5 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_6 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_7 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_8 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_9 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_10 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_11 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_12 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_13 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_14 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_15 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_16 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_17 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_18 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_19 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_20 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_21 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_22 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_23 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_24 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_25 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_26 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_27 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_28 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_29 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_30 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_31 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_32 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_33 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_34 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_35 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_36 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_37 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_38 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_39 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_40 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_41 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_42 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_43 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_44 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_45 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_46 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_47 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_48 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_49 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_50 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_51 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_52 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_53 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_54 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_55 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_56 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_57 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_58 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_59 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_60 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_61 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_62 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_63 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_64 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_65 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_66 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_67 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_68 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_69 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_70 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_71 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_72 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_73 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_74 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_75 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_76 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_77 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_78 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_79 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_80 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_81 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_82 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_83 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_84 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_85 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_86 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_87 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_88 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_89 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_90 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_91 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_92 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_93 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_94 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_95 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_96 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_97 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_98 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_bill_99 add column pay varchar(30) comment '支付给商户金额';

alter table wx_finance_receive_payway_0 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_1 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_2 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_3 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_4 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_5 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_6 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_7 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_8 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_9 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_10 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_11 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_12 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_13 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_14 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_15 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_16 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_17 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_18 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_19 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_20 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_21 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_22 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_23 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_24 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_25 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_26 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_27 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_28 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_29 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_30 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_31 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_32 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_33 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_34 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_35 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_36 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_37 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_38 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_39 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_40 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_41 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_42 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_43 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_44 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_45 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_46 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_47 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_48 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_49 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_50 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_51 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_52 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_53 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_54 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_55 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_56 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_57 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_58 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_59 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_60 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_61 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_62 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_63 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_64 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_65 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_66 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_67 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_68 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_69 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_70 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_71 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_72 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_73 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_74 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_75 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_76 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_77 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_78 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_79 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_80 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_81 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_82 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_83 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_84 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_85 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_86 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_87 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_88 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_89 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_90 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_91 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_92 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_93 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_94 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_95 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_96 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_97 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_98 add column pay varchar(30) comment '支付给商户金额';
alter table wx_finance_receive_payway_99 add column pay varchar(30) comment '支付给商户金额';


+ 17
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java Vedi File

@@ -4,6 +4,7 @@ import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumFinanceCashierType;
import com.iformall.enums.EnumFinanceReceiveStatus;
import com.iformall.enums.EnumFinanceReceiveType;

@@ -48,6 +49,9 @@ public class WxFinanceReceive extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "receiveMoney")
private String receiveMoney;
@io.swagger.annotations.ApiModelProperty(value = "支付给商户金额", name = "payMoney")
private String payMoney;
//跟useMoney的区别是,这个字段是记录此次收款冲抵了多少费用。useMoney是使用了自身多少的实收金额,预充用的到
@io.swagger.annotations.ApiModelProperty(value = "冲抵金额", name = "setOffMoney")
private String setOffMoney;
@@ -88,13 +92,24 @@ public class WxFinanceReceive extends TenantEntity {
return null;
}
@io.swagger.annotations.ApiModelProperty(value = "类型EnumFinanceReceiveType", name = "type")
@io.swagger.annotations.ApiModelProperty(value = "类型EnumFinanceCashierType", name = "type")
private Integer type;
@TableField(exist = false)
private String typeName;
public String getTypeName() {
if (null != type) {
return EnumFinanceReceiveType.getEnum(type).getMessage();
return EnumFinanceCashierType.getEnum(type).getMessage();
}
return null;
}
@io.swagger.annotations.ApiModelProperty(value = "类型EnumFinanceReceiveType", name = "type")
private Integer receiveType;
@TableField(exist = false)
private String receivetypeName;
public String getReceiveTypeName() {
if (null != receiveType) {
return EnumFinanceReceiveType.getEnum(receiveType).getMessage();
}
return null;
}


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java Vedi File

@@ -55,6 +55,9 @@ public class WxFinanceReceiveBill extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="receive")
private String receive;
@io.swagger.annotations.ApiModelProperty(value="支付给商户金额",name="pay")
private String pay;
@io.swagger.annotations.ApiModelProperty(value="科目编号",name="feesId")
private Long merchantId;


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceivePayway.java Vedi File

@@ -37,6 +37,9 @@ public class WxFinanceReceivePayway extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="receive")
private String receive;
@io.swagger.annotations.ApiModelProperty(value="支付给商户金额",name="pay")
private String pay;
@io.swagger.annotations.ApiModelProperty(value="isDel",name="isDel")
private Integer isDel;
}

+ 37
- 0
mallinkService/src/main/java/com/iformall/enums/EnumFinanceCashierType.java Vedi File

@@ -0,0 +1,37 @@
package com.iformall.enums;


/**
*/

public enum EnumFinanceCashierType {

RECEIVE(1,"收款单"),
PAY(2,"付款单")
;

public static EnumFinanceCashierType getEnum(Integer code) {
for (EnumFinanceCashierType value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumFinanceCashierType(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Vedi File

@@ -29,6 +29,7 @@ import com.iformall.domain.vo.FinanceBillSetoffSum;
import com.iformall.domain.vo.FinanceSetOffDetailVo;
import com.iformall.domain.vo.WxFinanceReceiveVo;
import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumFinanceCashierType;
import com.iformall.enums.EnumFinanceReceiveStatus;
import com.iformall.enums.EnumFinanceReceiveType;
import com.iformall.enums.EnumYesOrNo;
@@ -643,6 +644,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxFinanceReceive addreceive = new WxFinanceReceive();
addreceive.setId(receiveId);
addreceive.updateTenantInfo(user);
addreceive.setType(EnumFinanceCashierType.RECEIVE.getCode());
addreceive.setStatus(EnumFinanceReceiveStatus.NORMAL.getCode());
addreceive.setType(type.getCode());
addreceive.setReceiveMoney(receiveMoney);


+ 2
- 1
mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml Vedi File

@@ -13,6 +13,7 @@
<result column="pay_way" jdbcType="BIGINT" property="payWay"/>
<result column="receive_id" jdbcType="BIGINT" property="receiveId"/>
<result column="receive" jdbcType="VARCHAR" property="receive"/>
<result column="pay" jdbcType="VARCHAR" property="pay"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="starttime" jdbcType="TIMESTAMP" property="starttime"/>
<result column="endtime" jdbcType="TIMESTAMP" property="endtime"/>
@@ -21,7 +22,7 @@

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`bill_id`,`bill_type`,`fees_id`,
`pay_way`,`receive_id`,`receive`,`merchant_id`,`starttime`,`endtime`,`is_del`
`pay_way`,`receive_id`,`receive`,`pay`,`merchant_id`,`starttime`,`endtime`,`is_del`
</sql>

<sql id="dynamicWhereConditions">


+ 5
- 2
mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml Vedi File

@@ -8,10 +8,12 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="receive_money" jdbcType="VARCHAR" property="receiveMoney"/>
<result column="pay_money" jdbcType="VARCHAR" property="payMoney"/>
<result column="set_off_money" jdbcType="VARCHAR" property="setOffMoney"/>
<result column="use_money" jdbcType="VARCHAR" property="useMoney"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="receive_type" jdbcType="INTEGER" property="receiveType"/>
<result column="money_detail" jdbcType="VARCHAR" property="moneyDetail"/>
<result column="create_by" jdbcType="BIGINT" property="createBy"/>
<result column="create_by_name" jdbcType="VARCHAR" property="createByName"/>
@@ -24,8 +26,8 @@
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`receive_money`,`set_off_money`,`use_money`,`status`,`type`,`money_detail`,
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`remark`,`fees_id`,`is_print`
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`receive_money`,`pay_money`,`set_off_money`,`use_money`,`status`,`type`,
`receive_type`,`money_detail`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`remark`,`fees_id`,`is_print`
</sql>

<sql id="dynamicWhereConditions">
@@ -39,6 +41,7 @@
</if>
<if test=" null != status ">and `status` = #{status}</if>
<if test=" null != type ">and `type` = #{type}</if>
<if test=" null != receiveType ">and `receive_type` = #{receiveType}</if>
<if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if>
<if test=" null != createTimeBegin ">and `create_time` &gt;= #{createTimeBegin}</if>
<if test=" null != createTimeEnd ">and `create_time` &lt;= #{createTimeEnd}</if>


+ 4
- 3
mallinkService/src/main/resources/mapper/WxFinanceReceivePaywayMapper.xml Vedi File

@@ -10,11 +10,12 @@
<result column="pay_way" jdbcType="BIGINT" property="payWay"/>
<result column="receive_id" jdbcType="BIGINT" property="receiveId"/>
<result column="receive" jdbcType="VARCHAR" property="receive"/>
<result column="pay" jdbcType="VARCHAR" property="pay"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`pay_way`,`receive_id`,`receive`,`is_del`
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`pay_way`,`receive_id`,`receive`,`pay`,`is_del`
</sql>

<sql id="dynamicWhereConditions">
@@ -57,12 +58,12 @@
</update>
<insert id="insertPayWays" parameterType="HashMap">
INSERT INTO wx_finance_receive_payway (id,tenant_id,parent_tenant_id,create_time, update_time, pay_way, receive_id, receive, is_del)
INSERT INTO wx_finance_receive_payway (id,tenant_id,parent_tenant_id,create_time, update_time, pay_way, receive_id, receive,pay, is_del)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.id},#{item.tenantId},#{item.parentTenantId},
#{item.createTime},#{item.updateTime},#{item.payWay},#{item.receiveId},#{item.receive},#{item.isDel}
#{item.createTime},#{item.updateTime},#{item.payWay},#{item.receiveId},#{item.receive},#{item.pay},#{item.isDel}
)
</foreach>
</insert>


Caricamento…
Annulla
Salva