提交

jy-business/src/main/java/com/jy/business/capital/dao/CapitalTransactionsDao.java

@@ -7,6 +7,7 @@ import com.jy.business.capital.model.entity.CapitalTransactions;
 import com.jy.business.capital.model.table.CapitalAccountTable;
 import com.jy.business.capital.model.table.CapitalTransactionsTable;
 import com.jy.business.capital.model.vo.CapitalTransactionsVo;
+import com.jy.business.corporation.model.table.CorporationShopTable;
 import com.jy.business.corporation.model.table.CorporationTable;
 import com.jy.framework.model.base.BaseDao;
 import com.jy.system.model.table.SysUserTable;
@@ -24,6 +25,7 @@ public class CapitalTransactionsDao extends BaseDao<CapitalTransactionsMapper, C
         CapitalTransactionsTable ct = CapitalTransactionsTable.ct;
         CapitalAccountTable ca = CapitalAccountTable.ca;
         CorporationTable c = CorporationTable.c;
+        CorporationShopTable cs = CorporationShopTable.cs;
 
         return sql(CapitalTransactionsVo.class)
                 .select(
@@ -31,17 +33,20 @@ public class CapitalTransactionsDao extends BaseDao<CapitalTransactionsMapper, C
                         ca.accountAlias.as(CapitalTransactionsVo::getAccountAlias),
                         ca.amount.as(CapitalTransactionsVo::getBalance),
                         ca.initialAmount.as(CapitalTransactionsVo::getInitialAmount),
-                        c.name.as(CapitalTransactionsVo::getCorporationName)
+                        c.name.as(CapitalTransactionsVo::getCorporationName),
+                        cs.name.as(CapitalTransactionsVo::getCorporationShopName)
                 )
                 .from(ct)
                 .leftJoin(ca).on(ct.capitalAccountId.eq(ca.id))
                 .leftJoin(c).on(ca.corporationId.eq(c.id))
+                .leftJoin(cs).on(cs.id.eq(ct.corporationShopId))
                 .where(
                         ca.corporationId.eq(dto.getCorporationId()),
                         ct.capitalAccountId.eq(dto.getCapitalAccountId()),
                         ct.tradingTime.between(dto.getTradingTime()),
                         ct.type.eq(dto.getType()),
-                        ct.targetType.eq(dto.getTargetType())
+                        ct.targetType.eq(dto.getTargetType()),
+                        ct.corporationShopId.eq(dto.getCorporationShopId())
                 )
                 .orderBy(
                         ct.tradingTime.desc(),

jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalTransactionsSelectDto.java

@@ -44,4 +44,9 @@ public class CapitalTransactionsSelectDto extends BaseSelectDto {
      */
     private Integer targetType;
 
+    /**
+     * 店铺id
+     */
+    private String corporationShopId;
+
 }

jy-business/src/main/java/com/jy/business/capital/model/entity/CapitalTransactions.java

@@ -34,6 +34,11 @@ public class CapitalTransactions extends BaseIdPo {
     private Long capitalAccountId;
 
     /**
+     * 店铺id
+     */
+    private Long corporationShopId;
+
+    /**
      * 交易时间
      */
     @NotNull(groups = {AddGroup.class, EditGroup.class})

jy-business/src/main/java/com/jy/business/capital/model/table/CapitalTransactionsTable.java

@@ -20,6 +20,11 @@ public class CapitalTransactionsTable extends Table<CapitalTransactions> {
     public QueryColumn capitalAccountId = this.field(CapitalTransactions::getCapitalAccountId);
 
     /**
+     * 店铺id
+     */
+    public QueryColumn corporationShopId = this.field(CapitalTransactions::getCorporationShopId);
+
+    /**
      * 交易时间
      */
     public QueryColumn tradingTime = this.field(CapitalTransactions::getTradingTime);

jy-business/src/main/java/com/jy/business/capital/model/vo/CapitalTransactionsExportVo.java

@@ -26,6 +26,12 @@ public class CapitalTransactionsExportVo {
     private String corporationName;
 
     /**
+     * 店铺名称
+     */
+    @ExcelProperty("归属店铺")
+    private String corporationShopName;
+
+    /**
      * 账户别名
      */
     @ExcelProperty("资金账号")

jy-business/src/main/java/com/jy/business/capital/model/vo/CapitalTransactionsVo.java

@@ -46,4 +46,9 @@ public class CapitalTransactionsVo extends CapitalTransactions {
      */
     private String nickname;
 
+    /**
+     * 店铺名称
+     */
+    private String corporationShopName;
+
 }

jy-business/src/main/java/com/jy/business/payment/dao/PaymentRequestsDao.java

@@ -2,6 +2,7 @@ package com.jy.business.payment.dao;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jy.business.capital.model.table.CapitalAccountTable;
+import com.jy.business.corporation.model.table.CorporationShopTable;
 import com.jy.business.corporation.model.table.CorporationTable;
 import com.jy.business.payment.mapper.PaymentRequestsMapper;
 import com.jy.business.payment.model.dto.DetailListDto;
@@ -44,6 +45,8 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
         SysUserTable su = SysUserTable.su;
         // 资金账户
         CapitalAccountTable ca = CapitalAccountTable.ca;
+        // 店铺信息
+        CorporationShopTable cs = CorporationShopTable.cs;
 
         return sql(PaymentRequestsVo.class)
                 .select(
@@ -51,13 +54,15 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
                         c.name.as(PaymentRequestsVo::getCorporationName),
                         sd.name.as(PaymentRequestsVo::getDeptName),
                         su.nickname.as(PaymentRequestsVo::getUserName),
-                        ca.accountAlias.as(PaymentRequestsVo::getCapitalAccountName)
+                        ca.accountAlias.as(PaymentRequestsVo::getCapitalAccountName),
+                        cs.name.as(PaymentRequestsVo::getCorporationShopName)
                 )
                 .from(pr)
                 .leftJoin(c).on(pr.corporationId.eq(c.id))
                 .leftJoin(sd).on(pr.deptId.eq(sd.id))
                 .leftJoin(su).on(pr.createUser.eq(su.id))
                 .leftJoin(ca).on(pr.capitalAccountId.eq(ca.id))
+                .leftJoin(cs).on(pr.corporationShopId.eq(cs.id))
                 .where(
                         pr.createUser.eq(LoginContext.getUserId()),
                         pr.corporationId.eq(dto.getCorporationId()),
@@ -65,7 +70,8 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
                         pr.type.eq(dto.getType()),
                         pr.payType.eq(dto.getPayType()),
                         pr.approvalStatus.eq(dto.getApprovalStatus()),
-                        pr.paymentStatus.eq(dto.getPaymentStatus())
+                        pr.paymentStatus.eq(dto.getPaymentStatus()),
+                        pr.corporationShopId.eq(dto.getCorporationShopId())
                 )
                 .orderBy(
                         pr.id.desc()
@@ -120,6 +126,8 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
         SysUserTable su = SysUserTable.su;
         // 资金账户
         CapitalAccountTable ca = CapitalAccountTable.ca;
+        // 店铺信息
+        CorporationShopTable cs = CorporationShopTable.cs;
 
         return sql(PaymentRequestsVo.class)
                 .select(
@@ -127,13 +135,15 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
                         c.name.as(PaymentRequestsVo::getCorporationName),
                         sd.name.as(PaymentRequestsVo::getDeptName),
                         su.nickname.as(PaymentRequestsVo::getUserName),
-                        ca.accountAlias.as(PaymentRequestsVo::getCapitalAccountName)
+                        ca.accountAlias.as(PaymentRequestsVo::getCapitalAccountName),
+                        cs.name.as(PaymentRequestsVo::getCorporationShopName)
                 )
                 .from(pr)
                 .leftJoin(c).on(pr.corporationId.eq(c.id))
                 .leftJoin(sd).on(pr.deptId.eq(sd.id))
                 .leftJoin(su).on(pr.createUser.eq(su.id))
                 .leftJoin(ca).on(pr.capitalAccountId.eq(ca.id))
+                .leftJoin(cs).on(pr.corporationShopId.eq(cs.id))
                 .where(
                         pr.totalAmount.like(dto.getKeyword()).or(pr.useRemark.like(dto.getKeyword())),
                         pr.createUser.in(authService.getUserPermissionSet()),
@@ -142,7 +152,8 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
                         pr.deptId.eq(dto.getDeptId()),
                         pr.type.eq(dto.getType()),
                         pr.payType.eq(dto.getPayType()),
-                        pr.paymentStatus.eq(dto.getPaymentStatus())
+                        pr.paymentStatus.eq(dto.getPaymentStatus()),
+                        pr.corporationShopId.eq(dto.getCorporationShopId())
                 )
                 .orderBy(
                         pr.id.desc()

jy-business/src/main/java/com/jy/business/payment/model/dto/PaymentRequestsSelectDto.java

@@ -49,4 +49,9 @@ public class PaymentRequestsSelectDto extends BaseSelectDto {
      */
     private String keyword;
 
+    /**
+     * 店铺id
+     */
+    private Long corporationShopId;
+
 }

jy-business/src/main/java/com/jy/business/payment/model/entity/PaymentRequests.java

@@ -30,6 +30,11 @@ public class PaymentRequests extends BaseIdPo {
     private Long corporationId;
 
     /**
+     * 店铺id
+     */
+    private Long corporationShopId;
+
+    /**
      * 部门id
      */
     private Long deptId;

jy-business/src/main/java/com/jy/business/payment/model/table/PaymentRequestsTable.java

@@ -20,6 +20,11 @@ public class PaymentRequestsTable extends Table<PaymentRequests> {
     public QueryColumn corporationId = this.field(PaymentRequests::getCorporationId);
 
     /**
+     * 店铺id
+     */
+    public QueryColumn corporationShopId = this.field(PaymentRequests::getCorporationShopId);
+
+    /**
      * 部门id
      */
     public QueryColumn deptId = this.field(PaymentRequests::getDeptId);

jy-business/src/main/java/com/jy/business/payment/model/vo/PaymentRemitExportVo.java

@@ -25,6 +25,12 @@ public class PaymentRemitExportVo {
     private String corporationName;
 
     /**
+     * 店铺名称
+     */
+    @ExcelProperty("归属店铺")
+    private String corporationShopName;
+
+    /**
      * 归属部门
      */
     @ExcelProperty("归属部门")

jy-business/src/main/java/com/jy/business/payment/model/vo/PaymentRequestsExportVo.java

@@ -32,6 +32,12 @@ public class PaymentRequestsExportVo {
     private String corporationName;
 
     /**
+     * 店铺名称
+     */
+    @ExcelProperty("归属店铺")
+    private String corporationShopName;
+
+    /**
      * 归属部门
      */
     @ExcelProperty("归属部门")

jy-business/src/main/java/com/jy/business/payment/model/vo/PaymentRequestsVo.java

@@ -42,4 +42,9 @@ public class PaymentRequestsVo extends PaymentRequests {
      */
     private List<PaymentRequestsDetailVo> paymentRequestsDetailList;
 
+    /**
+     * 店铺名称
+     */
+    private String corporationShopName;
+
 }

jy-business/src/main/java/com/jy/business/payment/service/impl/PaymentRequestsServiceImpl.java

@@ -125,7 +125,7 @@ public class PaymentRequestsServiceImpl implements PaymentRequestsService {
 
         // 更新打款金额和状态
         paymentRequests.setRemitAmount(totalAmount);
-        paymentRequests.setPaymentStatus(amountCompareTo == 0 ? 2 : 1);
+        paymentRequests.setPaymentStatus(2);
         paymentRequestsDao.updateById(paymentRequests);
 
         // 保存打款记录
@@ -142,6 +142,7 @@ public class PaymentRequestsServiceImpl implements PaymentRequestsService {
         capitalTransactionsDto.setTargetDepositBank(paymentRequests.getDepositBank());
         capitalTransactionsDto.setTargetAccount(paymentRequests.getAccount());
         capitalTransactionsDto.setRemark(dto.getRemark());
+        capitalTransactionsDto.setCorporationShopId(paymentRequests.getCorporationShopId());
         capitalTransactionsService.add(capitalTransactionsDto);
     }
 

jy-ui/src/views/business/capital/transactions/index.vue

@@ -5,16 +5,10 @@ import { ToolbarConfigType } from '@/components/AToolbar/type'
 import { ColumnConfigType } from '@/components/ATable/type'
 import { StrAnyObj, StrAnyObjArr } from '@/typings'
 import { useHandleData } from '@/utils/useHandleData'
-import {
-  getPageApi,
-  getDetailApi,
-  addApi,
-  editApi,
-  deleteApi,
-  excelExportApi
-} from '@/api/business/capital/transactions'
+import { getPageApi, getDetailApi, addApi, editApi, deleteApi, excelExportApi } from '@/api/business/capital/transactions'
 import { getPageApi as getCapitalAccountPageApi } from '@/api/business/capital/account'
 import { getPageApi as getCorporationPageApi } from '@/api/business/corporation/corporation'
+import { getPageApi as getShopApi } from '@/api/business/corporation/shop'
 
 const queryRef = ref<InstanceType<typeof AForm>>()
 const formRef = ref<InstanceType<typeof AForm>>()
@@ -44,6 +38,14 @@ const queryConfig: FormConfigType[] = [
   },
   {
     type: 'select',
+    prop: 'corporationShopId',
+    label: '归属店铺',
+    option: async () => (await getShopApi({ searchAll: true })).records,
+    keyName: 'id',
+    labelName: 'name'
+  },
+  {
+    type: 'select',
     prop: 'capitalAccountId',
     label: '资金账号',
     keyName: 'id',
@@ -132,6 +134,10 @@ const columnConfig: ColumnConfigType[] = [
     label: '归属公司'
   },
   {
+    prop: 'corporationShopName',
+    label: '归属店铺'
+  },
+  {
     prop: 'accountAlias',
     label: '资金账号'
   },
@@ -184,7 +190,7 @@ const columnConfig: ColumnConfigType[] = [
     showOverflowTooltip: true
   },
   {
-    width: 250,
+    width: 160,
     handleConfig: [
       {
         common: 'update',
@@ -220,6 +226,14 @@ const formConfig: FormConfigType[] = [
     rule: [{ required: true, message: '资金账号不能为空', trigger: 'blur' }]
   },
   {
+    type: 'select',
+    prop: 'corporationShopId',
+    label: '归属店铺',
+    option: async () => (await getShopApi({ searchAll: true })).records,
+    keyName: 'id',
+    labelName: 'name'
+  },
+  {
     type: 'datePicker',
     prop: 'tradingTime',
     label: '交易时间',
@@ -249,7 +263,7 @@ const formConfig: FormConfigType[] = [
     type: 'radio',
     prop: 'hasContract',
     label: '合同到账',
-    if: () => formData.value.type === 1,
+    if: () => formData.value.type === 1 && formData.value.id === undefined,
     option: [
       {
         key: 1,
@@ -375,7 +389,7 @@ function handleRemove(idList: string[]) {
       :page-total="pageTotal"
       :toolbar-config="toolbarConfig"
       :column-config="columnConfig"
-      v-model:showQuery="showQuery"
+      v-model:show-query="showQuery"
       v-model:page-num="queryData.pageNum"
       v-model:page-size="queryData.pageSize"
       @page-num-change="getPage"
@@ -384,12 +398,7 @@ function handleRemove(idList: string[]) {
     >
     </a-table>
 
-    <a-dialog
-      v-model="dialogVisible"
-      :title="dialogTitle"
-      @submit="formSubmit"
-      @closed="formClosed"
-    >
+    <a-dialog v-model="dialogVisible" :title="dialogTitle" @submit="formSubmit" @closed="formClosed">
       <a-form ref="formRef" v-model="formData" :config="formConfig" :span="24"> </a-form>
     </a-dialog>
   </div>

jy-ui/src/views/business/corporation/shop/index.vue

@@ -31,7 +31,7 @@ const queryConfig: FormConfigType[] = [
   {
     type: 'select',
     prop: 'corporationId',
-    label: '所属公司',
+    label: '归属公司',
     option: async () => (await getCorporationPageApi({ searchAll: true })).records,
     keyName: 'id',
     labelName: 'name'
@@ -79,7 +79,7 @@ const columnConfig: ColumnConfigType[] = [
   },
   {
     prop: 'corporationName',
-    label: '所属公司',
+    label: '归属公司',
     width: 220
   },
   {
@@ -124,7 +124,7 @@ const formConfig: FormConfigType[] = [
   {
     type: 'select',
     prop: 'corporationId',
-    label: '所属公司',
+    label: '归属公司',
     option: async () => (await getCorporationPageApi({ searchAll: true })).records,
     keyName: 'id',
     labelName: 'name',

jy-ui/src/views/business/payment/remit/index.vue

@@ -15,6 +15,7 @@ import DeptTreeSelect from '@/views/components/DeptTreeSelect/index.vue'
 import { getPageApi as getCapitalAccountPageApi } from '@/api/business/capital/account'
 import MoneyPDF from '@/components/PDF/moneyPDF.vue'
 import { getPdf } from '@/utils/getPdf.js'
+import {getPageApi as getShopApi} from "@/api/business/corporation/shop";
 
 const queryRef = ref<InstanceType<typeof AForm>>()
 const formRef = ref<InstanceType<typeof AForm>>()
@@ -56,6 +57,14 @@ const queryConfig: FormConfigType[] = [
     }
   },
   {
+    type: 'select',
+    prop: 'corporationShopId',
+    label: '归属店铺',
+    option: async () => (await getShopApi({ searchAll: true })).records,
+    keyName: 'id',
+    labelName: 'name'
+  },
+  {
     type: 'slot',
     prop: 'deptId',
     label: '归属部门'
@@ -133,6 +142,10 @@ const columnConfig: ColumnConfigType[] = [
     label: '归属公司'
   },
   {
+    prop: 'corporationShopName',
+    label: '归属店铺'
+  },
+  {
     prop: 'deptName',
     label: '归属部门'
   },

jy-ui/src/views/business/payment/requests/flowDetail.vue

@@ -8,6 +8,7 @@ import { getPageApi as getCorporationPageApi } from '@/api/business/corporation/
 import { getPageApi as getCapitalAccountPageApi } from '@/api/business/capital/account'
 import { ColumnConfigType } from '@/components/ATable/type'
 import { getDetailApi } from '@/api/business/payment/requests'
+import {getPageApi as getShopApi} from "@/api/business/corporation/shop";
 
 const props = withDefaults(
   defineProps<{
@@ -50,6 +51,15 @@ const formConfig: FormConfigType[] = [
     rule: [{ required: true, message: '归属公司id不能为空', trigger: 'blur' }]
   },
   {
+    type: 'select',
+    prop: 'corporationShopId',
+    label: '归属店铺',
+    option: async () => (await getShopApi({ searchAll: true })).records,
+    keyName: 'id',
+    labelName: 'name',
+    placeholder: props.disabled ? '' : undefined,
+  },
+  {
     type: 'slot',
     prop: 'deptId',
     label: '归属部门',

jy-ui/src/views/business/payment/requests/index.vue

@@ -22,6 +22,7 @@ import { getDictByCode } from '@/utils/dict'
 import MoneyPDF from '@/components/PDF/moneyPDF.vue'
 import { getPdf } from '@/utils/getPdf.js'
 import { getPageApi as getContractPageApi } from '@/api/business/contract/info'
+import {getPageApi as getShopApi} from "@/api/business/corporation/shop";
 
 const queryRef = ref<InstanceType<typeof AForm>>()
 const formRef = ref<InstanceType<typeof AForm>>()
@@ -61,6 +62,14 @@ const queryConfig: FormConfigType[] = [
     }
   },
   {
+    type: 'select',
+    prop: 'corporationShopId',
+    label: '归属店铺',
+    option: async () => (await getShopApi({ searchAll: true })).records,
+    keyName: 'id',
+    labelName: 'name'
+  },
+  {
     type: 'slot',
     prop: 'deptId',
     label: '归属部门'
@@ -172,6 +181,10 @@ const columnConfig: ColumnConfigType[] = [
     label: '归属公司'
   },
   {
+    prop: 'corporationShopName',
+    label: '归属店铺'
+  },
+  {
     prop: 'deptName',
     label: '归属部门'
   },
@@ -316,6 +329,14 @@ const formConfig: FormConfigType[] = [
     rule: [{ required: true, message: '归属公司id不能为空', trigger: 'blur' }]
   },
   {
+    type: 'select',
+    prop: 'corporationShopId',
+    label: '归属店铺',
+    option: async () => (await getShopApi({ searchAll: true })).records,
+    keyName: 'id',
+    labelName: 'name'
+  },
+  {
     type: 'slot',
     prop: 'deptId',
     label: '归属部门',