9-28 新增收款

src/main/java/com/example/demo/DemoApplication.java

@@ -17,6 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @MapperScan(basePackages = "com.example.demo.mapper.cms", sqlSessionTemplateRef = "mysql4SqlSessionTemplate")
 @MapperScan(basePackages = "com.example.demo.mapper.live", sqlSessionTemplateRef = "mysql5SqlSessionTemplate")
 @MapperScan(basePackages = "com.example.demo.mapper.sqlserver", sqlSessionTemplateRef = "sqlserver1SqlSessionTemplate")
+@MapperScan(basePackages = "com.example.demo.mapper.cash", sqlSessionTemplateRef = "mysql1SqlSessionTemplate")
 public class DemoApplication {
 
     public static void main(String[] args) {

src/main/java/com/example/demo/controller/coin/RefundController.java

@@ -128,8 +128,8 @@ public class RefundController {
         return Result.success(list);
     }
 
-    //消耗金币增加
-    @Log("新增金币消耗")
+    //消耗金币退款
+    @Log("新增金币退款")
     @PostMapping("/add")
     public Result add(@RequestBody RefundUser refundUser) {
         try {

src/main/java/com/example/demo/domain/vo/cash/CashCollection.java

@@ -33,7 +33,7 @@ public class CashCollection implements Serializable {
     private String orderCode;           // 金币订单号
     private String bankCode;            // 银行流水订单号
     private String goodsName;           // 商品名称
-    private String goodsNum;            // 商品数量
+    private Integer goodsNum;            // 商品数量
     //金额信息
     private String paymentCurrency;     // 付款币种
     private BigDecimal paymentAmount;   // 付款金额
@@ -55,4 +55,212 @@ public class CashCollection implements Serializable {
     private LocalDateTime createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private LocalDateTime updateTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public Integer getJwcode() {
+        return jwcode;
+    }
+
+    public void setJwcode(Integer jwcode) {
+        this.jwcode = jwcode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMarket() {
+        return market;
+    }
+
+    public void setMarket(String market) {
+        this.market = market;
+    }
+
+    public String getActivity() {
+        return activity;
+    }
+
+    public void setActivity(String activity) {
+        this.activity = activity;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public Integer getGoodsNum() {
+        return goodsNum;
+    }
+
+    public void setGoodsNum(Integer goodsNum) {
+        this.goodsNum = goodsNum;
+    }
+
+    public String getPaymentCurrency() {
+        return paymentCurrency;
+    }
+
+    public void setPaymentCurrency(String paymentCurrency) {
+        this.paymentCurrency = paymentCurrency;
+    }
+
+    public BigDecimal getPaymentAmount() {
+        return paymentAmount;
+    }
+
+    public void setPaymentAmount(BigDecimal paymentAmount) {
+        this.paymentAmount = paymentAmount;
+    }
+
+    public String getReceivedCurrency() {
+        return receivedCurrency;
+    }
+
+    public void setReceivedCurrency(String receivedCurrency) {
+        this.receivedCurrency = receivedCurrency;
+    }
+
+    public BigDecimal getReceivedAmount() {
+        return receivedAmount;
+    }
+
+    public void setReceivedAmount(BigDecimal receivedAmount) {
+        this.receivedAmount = receivedAmount;
+    }
+
+    public BigDecimal getHandlingCharge() {
+        return handlingCharge;
+    }
+
+    public void setHandlingCharge(BigDecimal handlingCharge) {
+        this.handlingCharge = handlingCharge;
+    }
+
+    public String getReceivedMarket() {
+        return receivedMarket;
+    }
+
+    public void setReceivedMarket(String receivedMarket) {
+        this.receivedMarket = receivedMarket;
+    }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
+
+    public LocalDateTime getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(LocalDateTime payTime) {
+        this.payTime = payTime;
+    }
+
+    public LocalDateTime getReceivedTime() {
+        return receivedTime;
+    }
+
+    public void setReceivedTime(LocalDateTime receivedTime) {
+        this.receivedTime = receivedTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getSubmitterId() {
+        return submitterId;
+    }
+
+    public void setSubmitterId(Integer submitterId) {
+        this.submitterId = submitterId;
+    }
+
+    public String getVoucher() {
+        return voucher;
+    }
+
+    public void setVoucher(String voucher) {
+        this.voucher = voucher;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
 }

src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java

@@ -0,0 +1,19 @@
+package com.example.demo.mapper.cash;
+
+import com.example.demo.domain.entity.CashRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @program: gold-java
+ * @ClassName CashCollectionMapper
+ * @description:
+ * @author: Ethan
+ * @create: 2025−09-26 17:17
+ * @Version 1.0
+ **/
+@Mapper
+public interface CashCollectionMapper {
+
+    //新增收款订单
+    void add(CashRecord cashRecord);
+}

src/main/java/com/example/demo/service/cash/CashCollectionService.java

@@ -13,6 +13,6 @@ import com.example.demo.domain.vo.coin.Result;
  **/
 
 public interface CashCollectionService {
-
+    //新增收款订单
     Result add(CashCollection cashCollection);
 }

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -3,6 +3,7 @@ package com.example.demo.serviceImpl.cash;
 import com.example.demo.domain.entity.CashRecord;
 import com.example.demo.domain.vo.cash.CashCollection;
 import com.example.demo.domain.vo.coin.Result;
+import com.example.demo.mapper.cash.CashCollectionMapper;
 import com.example.demo.service.cash.CashCollectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,7 +22,9 @@ import java.util.UUID;
 public class CashCollectionServiceImpl implements CashCollectionService {
 
     @Autowired
+    private CashCollectionMapper cashCollectionMapper;
 
+    //新增收款订单
     @Override
     public Result add(CashCollection cashCollection) {
         if (cashCollection.getJwcode()==null){
@@ -66,7 +69,26 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         //生成订单号后半部分
         String orderNumber = UUID.randomUUID().toString().replaceAll("-", "");
         CashRecord cashRecord = new CashRecord();
-        cashRecord.setOrderCode("XJ_" + orderNumber);
-        return Result.success("添加成功",cashRecord);
+        //构建订单信息
+        cashRecord.setOrderCode("XJ_" + orderNumber);   //订单号
+        cashRecord.setJwcode(cashCollection.getJwcode());   //精网号
+        cashRecord.setName(cashCollection.getName());   //客户姓名
+        cashRecord.setActivity(cashCollection.getActivity());   // 活动
+        cashRecord.setGoodsName(cashCollection.getGoodsName()); //商品名称
+        cashRecord.setGoodNum(cashCollection.getGoodsNum());    //商品数量
+        cashRecord.setPaymentCurrency(cashCollection.getPaymentCurrency()); //付款币种
+        cashRecord.setPaymentAmount(cashCollection.getPaymentAmount());     //付款金额
+        cashRecord.setReceivedMarket(cashCollection.getReceivedMarket());   //到账地区
+        cashRecord.setPayType(cashCollection.getPayType());     //支付方式
+        cashRecord.setPayTime(cashCollection.getPayTime());     //付款时间
+        cashRecord.setVoucher(cashCollection.getVoucher());     //转账凭证
+        cashRecord.setRemark(cashCollection.getRemark());       //备注
+        cashRecord.setStatus(0);    //订单状态：付款线下财务待审核
+        cashRecord.setSubmitterId(cashCollection.getSubmitterId()); //提交人ID
+        cashRecord.setOrderType(1);     //订单类型：1-收款
+        //插入新收款订单
+        cashCollectionMapper.add(cashRecord);
+
+        return Result.success("添加成功");
     }
 }

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.cash.CashCollectionMapper">
+
+
+    <insert id="add">
+        insert into
+            cash_collection(order_type,jwcode,name,market,activity,
+                            order_code,goods_name,goods_num,
+                            payment_currency,payment_amount,received_market,
+                            pay_type,pay_time,status,submitter_id,
+                            voucher,remark)
+        values(#{orderType},#{jwcode},#{name},#{market},#{activity},
+               #{orderCode},#{goodsName},#{goodsNum},#{paymentCurrency},
+               #{paymentAmount},#{receivedMarket},#{payType},#{payTime},
+               #{status},#{submitterId},#{voucher},#{remark})
+    </insert>
+</mapper>