代码调整

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/mq/constant/OrderMqKey.java

@@ -118,51 +118,6 @@ public interface OrderMqKey {
      */
     String EDIT_QUEUE_CLEAR_FOR_FINISHED = "mq.queue.xingxi.clear.order.finished";
 
-
-    //=====================================推广者佣金订阅队列===========================================================
-    /**
-     * 支付完成-推广者佣金订阅队列
-     */
-    String EDIT_QUEUE_COMMISSION_FOR_PAYED = "mq.queue.xingxi.commission.order.payed";
-
-    /**
-     * 订单取消-推广者佣金订阅队列
-     */
-    String EDIT_QUEUE_COMMISSION_FOR_CANCELED = "mq.queue.xingxi.commission.order.canceled";
-
-    /**
-     * 退货完成-推广者佣金订阅队列
-     */
-    String EDIT_QUEUE_COMMISSION_FOR_RETURNED = "mq.queue.xingxi.commission.order.returned";
-
-    /**
-     * 订单完成-推广者佣金订阅队列
-     */
-    String EDIT_QUEUE_COMMISSION_FOR_FINISHED = "mq.queue.xingxi.commission.order.finished";
-
-
-    //=====================================发票订单订阅队列===========================================================
-    /**
-     * 支付完成-发票订单订阅队列
-     */
-    String EDIT_QUEUE_INVOICE_FOR_PAYED = "mq.queue.xingxi.invoice.order.payed";
-
-    /**
-     * 订单取消-发票订单订阅队列
-     */
-    String EDIT_QUEUE_INVOICE_FOR_CANCELED = "mq.queue.xingxi.invoice.order.canceled";
-
-    /**
-     * 退货完成-发票订单订阅队列
-     */
-    String EDIT_QUEUE_INVOICE_FOR_RETURNED = "mq.queue.xingxi.invoice.order.returned";
-
-    /**
-     * 订单完成-发票订单订阅队列
-     */
-    String EDIT_QUEUE_INVOICE_FOR_FINISHED = "mq.queue.xingxi.invoice.order.finished";
-
-
     //===========================================延迟============================================================
     /**
      * 订单消息交换机(延迟)

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/WxAuthenticationSuccessHandler.java

@@ -40,6 +40,7 @@ class WxAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
         userProfileDTO.setGender(sysUser.getSex());
 
         String accessToken = JWTUtils.generateJwtString(sysUser.getWxOpenId(), sysUser.getLoginDate());
+        log.debug(accessToken);
         String requestId = (String) request.getAttribute("X-REQUEST-ID");
 
         ResponseDTO<Map<String, Object>> responseDTO = new ResponseDTO<>(200);

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/WxLoginAuthenticationManager.java

@@ -53,6 +53,7 @@ public class WxLoginAuthenticationManager implements AuthenticationManager {
         } else {
             SysUser updateSysUser = new SysUser();
             updateSysUser.setUserId(dbUser.getUserId());
+            updateSysUser.setWxOpenId(wxOpenId);
             updateSysUser.setWxSessionKey(wxSessionKey);
             updateSysUser.setLoginDate(getLoginDate());
             updateSysUser.setUpdateUser(wxOpenId);

08.src/Xingxi/xingxi-mq-server/pom.xml

@@ -14,7 +14,11 @@
     <description>xingxi-mq-server</description>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.xingxi</groupId>
+            <artifactId>xingxi-unifiedpay-spring-boot-starter</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.xingxi</groupId>
             <artifactId>xingxi-system</artifactId>

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/order/OrderCloseConsumer.java

@@ -1,25 +1,62 @@
 package com.xingxi.mq.consumer.order;
 
+import com.alibaba.fastjson.JSON;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.xingxi.business.Order.domain.Order;
+import com.xingxi.business.Order.domain.OrderDetail;
+import com.xingxi.business.Order.service.IOrderDetailService;
+import com.xingxi.business.Order.service.IOrderService;
+import com.xingxi.business.PaymentInfo.domain.PaymentInfo;
+import com.xingxi.business.PaymentInfo.service.IPaymentInfoService;
+import com.xingxi.business.ProdInventory.mapper.ProdInventoryBillMapper;
+import com.xingxi.business.ProdInventory.mapper.ProdInventoryMapper;
+import com.xingxi.common.enums.EDelFlag;
+import com.xingxi.common.enums.EOrderDetailStatus;
+import com.xingxi.common.enums.EOrderStatus;
+import com.xingxi.common.mq.bo.order.OrderBO;
 import com.xingxi.common.mq.constant.OrderMqKey;
 import com.xingxi.common.mq.core.AbstractRabbitConsumer;
 import com.google.common.collect.Lists;
 import com.rabbitmq.client.Channel;
+import com.xingxi.common.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
 @Component
 public class OrderCloseConsumer extends AbstractRabbitConsumer {
+
+    @Resource
+    private IOrderService orderService;
+
+    @Resource
+    private IOrderDetailService orderDetailService;
+
+    @Resource
+    private IPaymentInfoService paymentInfoService;
+
+    @Autowired
+    private ProdInventoryBillMapper prodInventoryBillMapper;
+    @Autowired
+    private ProdInventoryMapper prodInventoryMapper;
+
+    @Autowired
+    private WxPayService wxPayService;
+
     @Bean(OrderMqKey.EDIT_QUEUE_DELAY_FOR_UNPAID)
     @Override
     protected List<Binding> getBindingList() {
-        long xmTtl = 10 * 60 * 1000;
+        long xmTtl = 15 * 60 * 1000;
         return Lists.newArrayList(
                 this.bindDelay(OrderMqKey.EDIT_EXCHANGE_DELAY,
                         OrderMqKey.EDIT_QUEUE_DELAY_FOR_UNPAID,
@@ -35,6 +72,97 @@ public class OrderCloseConsumer extends AbstractRabbitConsumer {
 
     @Override
     public boolean execute(String body, Channel channel, Message message) throws Exception {
+        log.info("订单关闭MQ,处理推送的订单数据【{}】.", body);
+
+        OrderBO orderBO = JSON.parseObject(body, OrderBO.class);
+
+        Date nowDate = DateUtils.getNowDate();
+        String opName = "订单关闭MQ";
+
+        if(orderBO == null || orderBO.getOrderId() == null || orderBO.getOrderId() == 0L) {
+            return true;
+        }
+        // 如果没有支付成功就取消
+        Order orgOrder = orderService.selectOrderByOrderId(orderBO.getOrderId());
+        if(orgOrder == null) {
+            log.info("订单关闭MQ,订单【{}】的信息不存在,不做处理.", orderBO.getOrderNo());
+            return true;
+        }
+        if(!EOrderStatus.ORDERED.getVal().equals(orgOrder.getOrderStatus())) {
+            log.info("订单关闭MQ,订单【{}】的订单状态为【{}】,非【{}】不做处理.", orgOrder.getOrderNo(), orgOrder.getOrderStatus(), EOrderStatus.ORDERED.getDesc());
+            return true;
+        }
+
+        // 支付信息
+        PaymentInfo spi = new PaymentInfo();
+        spi.setOrderId(orgOrder.getOrderId());
+        spi.setDelFlag(EDelFlag.NO.getVal());
+
+        List<PaymentInfo> paymentInfoList = paymentInfoService.selectPaymentInfoList(spi);
+
+        if(CollectionUtils.isNotEmpty(paymentInfoList)){
+            PaymentInfo pi = paymentInfoList.get(0);
+            if(pi != null) {
+                // 查询是否支付成功 TODO
+
+
+                // 如果支付成功并且微信支付没有回调成功就在这里退款 TODO
+
+
+                return true;
+            }
+        }
+
+        // 取消主订单
+        Order order = new Order();
+        order.setOrderId(orgOrder.getOrderId());
+        order.setOrderStatus(EOrderStatus.CANCELLED.getVal());
+        order.setCancelTime(nowDate);
+        order.setUpdateUser(opName);
+        order.setUpdateTime(nowDate);
+        orderService.updateOrder(order);
+
+        // 取消子订单
+        OrderDetail sod = new OrderDetail();
+        sod.setOrderId(order.getOrderId());
+        List<OrderDetail> orderDetails = orderDetailService.selectOrderDetailList(sod);
+        for (OrderDetail od : orderDetails) {
+            //将订单明细设为已取消
+            OrderDetail updateDetail = new OrderDetail();
+            updateDetail.setOrderDetailId(od.getOrderDetailId());
+            updateDetail.setOrderDetailStatus(EOrderDetailStatus.CANCELLED.getVal());
+            updateDetail.setUpdateUser(opName);
+            updateDetail.setUpdateTime(nowDate);
+            orderDetailService.updateOrderDetail(updateDetail);
+
+            //减少锁库，恢复库存
+//            ProdStockVo sps = new ProdStockVo();
+//            sps.setProdId(od.getProdId());
+//            sps.setPprId(od.getPprId());
+//            sps.setVendorId(od.getVendorId());
+//
+//            ProdStockVo ps = prodInventoryMapper.selectProdStockVoByUnionId(sps);
+//            sps.setStockId(ps.getStockId());
+//            sps.setAvailQty(od.getBuyQty());
+//            sps.setOrderId(orgOrder.getOrderId());
+//            sps.setOrderNo(orgOrder.getOrderNo());
+//            sps.setBillType(EStockBillType.IN.getVal());
+//            sps.setBillKind(EStockBillKind.IN_CANCEL.getVal());
+//            sps.setUpdateUser(opName);
+//            sps.setUpdateTime(nowDate);
+//            prodStockVoService.updateProdStockQty(sps);
+//            prodInventoryMapper.
+        }
+
+//        // 关闭支付信息
+//        PaymentInfo upi = new PaymentInfo();
+//        upi.setOrderId(orgOrder.getOrderId());
+//        upi.setTradeState(EOrderStatus.CANCELLED.getVal());
+//        upi.setUpdateUser(opName);
+//        upi.setUpdateTime(nowDate);
+//        paymentInfoService.updateOrderStatusByOrderId(upi);
+
+        log.info("订单关闭MQ,订单【{}】数据处理完成.", orgOrder.getOrderNo());
         return true;
     }
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/mapper/MqProdInventoryMapper.java

@@ -0,0 +1,31 @@
+package com.xingxi.mq.server.order.mapper;
+
+import com.xingxi.business.ProdInventory.domain.ProdInventory;
+import com.xingxi.mq.entity.OrderDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 队列 库存Mapper接口
+ *
+ * @author xingxi
+ * @date 2025-05-11
+ */
+@Repository
+public interface MqProdInventoryMapper {
+
+    /**
+     * 减少库存数量
+     *
+     * @param prodInventory 库存信息
+     * @return 更新记录数
+     */
+    int updateSubtractProdStock(ProdInventory prodInventory);
+
+    /**
+     * 增加库存数量
+     *
+     * @param prodInventory 库存信息
+     * @return 更新记录数
+     */
+    int updatePlusProdStock(ProdInventory prodInventory);
+}

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/master/CompanyMqMapper.xml

@@ -1,79 +0,0 @@
-<?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.xingxi.mq.server.master.mapper.CompanyMqMapper">
-    
-    <resultMap type="Company" id="CompanyResult">
-        <result property="companyId"    column="companyId"    />
-        <result property="deptId"    column="deptId"    />
-        <result property="companyName"    column="companyName"    />
-        <result property="companyCode"    column="companyCode"    />
-        <result property="licenseImgId"    column="licenseImgId"    />
-        <result property="validBegin"    column="validBegin"    />
-        <result property="validEnd"    column="validEnd"    />
-        <result property="bankName"    column="bankName"    />
-        <result property="bankAccount"    column="bankAccount"    />
-        <result property="legalPerson"    column="legalPerson"    />
-        <result property="legalNum"    column="legalNum"    />
-        <result property="legalIdPortraitId"    column="legalIdPortraitId"    />
-        <result property="legalIdEmblemId"    column="legalIdEmblemId"    />
-        <result property="legalIdPeriodStart"    column="legalIdPeriodStart"    />
-        <result property="legalIdPeriodEnd"    column="legalIdPeriodEnd"    />
-        <result property="taxRate"    column="taxRate"    />
-        <result property="caStatus"    column="caStatus"    />
-        <result property="fclFlag"    column="fclFlag"    />
-        <result property="dsptbm"    column="dsptbm"    />
-        <result property="ptdj3desKey"    column="ptdj3desKey"    />
-        <result property="registrationCode"    column="registrationCode"    />
-        <result property="authCode"    column="authCode"    />
-        <result property="folderNo"    column="folderNo"    />
-        <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectCompany">
-        select
-            c.companyId,
-            c.deptId,
-            c.companyName,
-            c.companyCode,
-            c.licenseImgId,
-            c.validBegin,
-            c.validEnd,
-            c.bankName,
-            c.bankAccount,
-            c.legalPerson,
-            c.legalNum,
-            c.legalIdPortraitId,
-            c.legalIdEmblemId,
-            c.legalIdPeriodStart,
-            c.legalIdPeriodEnd,
-            c.taxRate,
-            c.caStatus,
-            c.fclFlag,
-            c.dsptbm,
-            c.ptdj3desKey,
-            c.registrationCode,
-            c.authCode,
-            c.folderNo,
-            c.remark,
-            c.delFlag,
-            c.createUser,
-            c.createTime,
-            c.updateUser,
-            c.updateTime
-        from m_company c
-    </sql>
-
-    <select id="selectCompanyByCompanyCode" parameterType="String" resultMap="CompanyResult">
-        <include refid="selectCompany"/>
-        where c.delFlag = '0' and c.companyCode = #{companyCode}
-        limit 1
-    </select>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/material/MaterialKindMqMapper.xml

@@ -1,48 +0,0 @@
-<?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.xingxi.mq.server.material.mapper.MaterialKindMqMapper">
-    
-    <resultMap type="MaterialKindMq" id="MaterialKindMqResult">
-        <result property="mateKindId"    column="mateKindId"    />
-        <result property="mercId"    column="mercId"    />
-        <result property="mateBelong"    column="mateBelong"    />
-        <result property="mateKindName"    column="mateKindName"    />
-        <result property="vendorId"    column="vendorId"    />
-        <result property="copyrightLicence"    column="copyrightLicence"    />
-        <result property="auditStatus"    column="auditStatus"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-
-        <result property="mateId"    column="mateId"    />
-    </resultMap>
-
-    <sql id="selectMaterialKindMq">
-        select
-            m.mateKindId,
-            m.mercId,
-            m.mateBelong,
-            m.mateKindName,
-            m.vendorId,
-            m.copyrightLicence,
-            m.auditStatus,
-            m.delFlag,
-            m.createUser,
-            m.createTime,
-            m.updateUser,
-            m.updateTime,
-            f.mateId
-            from m_material_kind m
-                inner join m_material f on m.mateKindId = f.mateKindId
-    </sql>
-
-    <select id="selectMaterialKindMqByMateId" parameterType="Long" resultMap="MaterialKindMqResult">
-        <include refid="selectMaterialKindMq"/>
-        where f.mateId = #{mateId}
-    </select>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/order/ClearOrderDetailVoMapper.xml

@@ -1,97 +0,0 @@
-<?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.xingxi.mq.server.order.mapper.ClearOrderDetailVoMapper">
-    
-    <resultMap type="ClearOrderDetail" id="ClearOrderDetailResult">
-        <result property="id"    column="id"    />
-        <result property="orderId"    column="orderId"    />
-        <result property="orderNo"    column="orderNo"    />
-        <result property="orderDetailId"    column="orderDetailId"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="buyerRole"    column="buyerRole"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="sellerRole"    column="sellerRole"    />
-        <result property="tradeType"    column="tradeType"    />
-        <result property="suiteId"    column="suiteId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodName"    column="prodName"    />
-        <result property="prodPropId"    column="prodPropId"    />
-        <result property="prodPropName"    column="prodPropName"    />
-        <result property="orgProdId"    column="orgProdId"    />
-        <result property="mateId"    column="mateId"    />
-        <result property="mateName"    column="mateName"    />
-        <result property="prodType"    column="prodType"    />
-        <result property="buyPrice"    column="buyPrice"    />
-        <result property="salePrice"    column="salePrice"    />
-        <result property="orderQty"    column="orderQty"    />
-        <result property="returnQty"    column="returnQty"    />
-        <result property="serviceRate"    column="serviceRate"    />
-        <result property="finishTime"    column="finishTime"    />
-        <result property="orderStatus"    column="orderStatus"    />
-        <result property="settleTime"    column="settleTime"    />
-        <result property="settleStatus"    column="settleStatus"    />
-        <result property="invoiceTime"    column="invoiceTime"    />
-        <result property="invoiceStatus"    column="invoiceStatus"    />
-        <result property="settleBatchNo"    column="settleBatchNo"    />
-        <result property="invoiceBatchNo"    column="invoiceBatchNo"    />
-        <result property="invoiceBillNo"    column="invoiceBillNo"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectClearOrderDetail">
-        select
-            c.id,
-            c.orderId,
-            c.orderNo,
-            c.orderDetailId,
-            c.buyerId,
-            c.buyerRole,
-            c.sellerId,
-            c.sellerRole,
-            c.tradeType,
-            c.suiteId,
-            c.prodId,
-            c.prodName,
-            c.prodPropId,
-            c.prodPropName,
-            c.orgProdId,
-            c.mateId,
-            c.mateName,
-            c.prodType,
-            c.buyPrice,
-            c.salePrice,
-            c.orderQty,
-            c.returnQty,
-            c.serviceRate,
-            c.finishTime,
-            c.orderStatus,
-            c.settleTime,
-            c.settleStatus,
-            c.invoiceTime,
-            c.invoiceStatus,
-            c.settleBatchNo,
-            c.invoiceBatchNo,
-            c.invoiceBillNo,
-            c.delFlag,
-            c.createUser,
-            c.createTime,
-            c.updateUser,
-            c.updateTime
-        from t_clear_order_detail c
-    </sql>
-
-    <update id="updateReturnQty" parameterType="ClearOrderDetail">
-        update t_clear_order_detail set returnQty = returnQty + #{returnQty}, updateUser = #{updateUser}, updateTime = #{updateTime}
-        where 1 = 1
-            <if test="orderId != null "> and orderId = #{orderId}</if>
-            <if test="orderDetailId != null "> and orderDetailId = #{orderDetailId}</if>
-            <if test="suiteId != null and suiteId != ''"> and suiteId = #{suiteId}</if>
-    </update>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/order/ClearOrderVoMapper.xml

@@ -1,68 +0,0 @@
-<?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.xingxi.mq.server.order.mapper.ClearOrderVoMapper">
-    
-    <resultMap type="ClearOrder" id="ClearOrderResult">
-        <result property="id"    column="id"    />
-        <result property="orderId"    column="orderId"    />
-        <result property="orderNo"    column="orderNo"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="buyerRole"    column="buyerRole"    />
-        <result property="tradeType"    column="tradeType"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="sellerRole"    column="sellerRole"    />
-        <result property="finishTime"    column="finishTime"    />
-        <result property="orderStatus"    column="orderStatus"    />
-        <result property="settleTime"    column="settleTime"    />
-        <result property="settleStatus"    column="settleStatus"    />
-        <result property="invoiceTime"    column="invoiceTime"    />
-        <result property="invoiceStatus"    column="invoiceStatus"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectClearOrder">
-        select
-            c.id,
-            c.orderId,
-            c.orderNo,
-            c.buyerId,
-            c.buyerRole,
-            c.tradeType,
-            c.sellerId,
-            c.sellerRole,
-            c.finishTime,
-            c.orderStatus,
-            c.settleTime,
-            c.settleStatus,
-            c.invoiceTime,
-            c.invoiceStatus,
-            c.delFlag,
-            c.createUser,
-            c.createTime,
-            c.updateUser,
-            c.updateTime
-        from t_clear_order c
-    </sql>
-
-    <update id="syncOrderStatusByOrderId" parameterType="ClearOrder">
-        <![CDATA[
-            update t_clear_order set
-                t_clear_order.orderStatus = #{orderStatus},
-                t_clear_order.updateTime  = #{updateTime},
-                t_clear_order.updateUser  = #{updateUser}
-            where t_clear_order.orderId = #{orderId}
-                and not exists(select 1 from t_clear_order_detail
-                where t_clear_order_detail.orderId = t_clear_order.orderId
-                and t_clear_order_detail.buyerId = t_clear_order.buyerId
-                and t_clear_order_detail.sellerId = t_clear_order.sellerId
-                and t_clear_order_detail.orderStatus <> #{orderStatus})
-        ]]>
-    </update>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/order/CommissionOrderDetailVoMapper.xml

@@ -1,81 +0,0 @@
-<?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.xingxi.mq.server.order.mapper.CommissionOrderDetailVoMapper">
-    
-    <resultMap type="CommissionOrderDetail" id="CommissionOrderDetailVoResult">
-        <result property="id"    column="id"    />
-        <result property="orderId"    column="orderId"    />
-        <result property="orderNo"    column="orderNo"    />
-        <result property="orderDetailId"    column="orderDetailId"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="buyerRole"    column="buyerRole"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="sellerRole"    column="sellerRole"    />
-        <result property="suiteId"    column="suiteId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodName"    column="prodName"    />
-        <result property="prodPropId"    column="prodPropId"    />
-        <result property="prodPropName"    column="prodPropName"    />
-        <result property="prodType"    column="prodType"    />
-        <result property="orderQty"    column="orderQty"    />
-        <result property="price"    column="price"    />
-        <result property="returnQty"    column="returnQty"    />
-        <result property="commissionRate"    column="commissionRate"    />
-        <result property="commissionAmount"    column="commissionAmount"    />
-        <result property="orderDetailStatus"    column="orderDetailStatus"    />
-        <result property="finishTime"    column="finishTime"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectCommissionOrderDetailVo">
-        select
-            c.id,
-            c.orderId,
-            c.orderNo,
-            c.orderDetailId,
-            c.buyerId,
-            c.buyerRole,
-            c.sellerId,
-            c.sellerRole,
-            c.suiteId,
-            c.prodId,
-            c.prodName,
-            c.prodPropId,
-            c.prodPropName,
-            c.prodType,
-            c.orderQty,
-            c.price,
-            c.returnQty,
-            c.commissionRate,
-            c.commissionAmount,
-            c.orderDetailStatus,
-            c.finishTime,
-            c.delFlag,
-            c.createUser,
-            c.createTime,
-            c.updateUser,
-            c.updateTime
-        from t_commission_order_detail c
-    </sql>
-
-    <update id="updateCommissionOrderDetailVo" parameterType="CommissionOrderDetail">
-        update t_commission_order_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="returnQty != null">returnQty = returnQty + #{returnQty},</if>
-            <if test="commissionAmount != null">commissionAmount = commissionAmount - #{commissionAmount},</if>
-            <if test="orderDetailStatus != null and orderDetailStatus != ''">orderDetailStatus = #{orderDetailStatus},</if>
-            <if test="finishTime != null">finishTime = #{finishTime},</if>
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/order/CommissionOrderVoMapper.xml

@@ -1,86 +0,0 @@
-<?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.xingxi.mq.server.order.mapper.CommissionOrderVoMapper">
-    
-    <resultMap type="CommissionOrder" id="CommissionOrderVoResult">
-        <result property="id"    column="id"    />
-        <result property="orderId"    column="orderId"    />
-        <result property="orderNo"    column="orderNo"    />
-        <result property="orderTime"    column="orderTime"    />
-        <result property="referrerId"    column="referrerId"    />
-        <result property="referrerRole"    column="referrerRole"    />
-        <result property="referrerStoreID"    column="referrerStoreID"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="buyerRole"    column="buyerRole"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="sellerRole"    column="sellerRole"    />
-        <result property="orderAmount"    column="orderAmount"    />
-        <result property="totalAmount"    column="totalAmount"    />
-        <result property="businessCategory"    column="businessCategory"    />
-        <result property="orderStatus"    column="orderStatus"    />
-        <result property="finishTime"    column="finishTime"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectCommissionOrderVo">
-        select
-            c.id,
-            c.orderId,
-            c.orderNo,
-            c.orderTime,
-            c.referrerId,
-            c.referrerRole,
-            c.referrerStoreID,
-            c.buyerId,
-            c.buyerRole,
-            c.sellerId,
-            c.sellerRole,
-            c.orderAmount,
-            c.totalAmount,
-            c.businessCategory,
-            c.orderStatus,
-            c.finishTime,
-            c.delFlag,
-            c.createUser,
-            c.createTime,
-            c.updateUser,
-            c.updateTime
-        from t_commission_order c
-    </sql>
-
-    <update id="updateCommissionOrderVo" parameterType="CommissionOrder">
-        update t_commission_order
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderAmount != null">orderAmount = orderAmount- #{orderAmount},</if>
-            <if test="totalAmount != null">totalAmount = totalAmount- #{totalAmount},</if>
-            <if test="orderStatus != null and orderStatus != ''">orderStatus = #{orderStatus},</if>
-            <if test="finishTime != null">finishTime = #{finishTime},</if>
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <update id="syncOrderStatusByOrderId" parameterType="CommissionOrder">
-        <![CDATA[
-            update t_commission_order set
-                t_commission_order.orderStatus = #{orderStatus},
-                t_commission_order.updateTime  = #{updateTime},
-                t_commission_order.updateUser  = #{updateUser}
-            where t_commission_order.orderId = #{orderId}
-                and not exists(select 1 from t_commission_order_detail
-                where t_commission_order_detail.orderId = t_commission_order.orderId
-                and t_commission_order_detail.buyerId = t_commission_order.buyerId
-                and t_commission_order_detail.sellerId = t_commission_order.sellerId
-                and t_commission_order_detail.orderStatus <> #{orderStatus})
-        ]]>
-    </update>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/order/InvoiceOrderMqMapper.xml

@@ -1,119 +0,0 @@
-<?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.xingxi.mq.server.order.mapper.InvoiceOrderMqMapper">
-    
-    <resultMap type="InvoiceOrder" id="InvoiceOrderResult">
-        <result property="id"    column="id"    />
-        <result property="orderId"    column="orderId"    />
-        <result property="orderNo"    column="orderNo"    />
-        <result property="orderDetailId"    column="orderDetailId"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="buyerRole"    column="buyerRole"    />
-        <result property="tradeType"    column="tradeType"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="sellerRole"    column="sellerRole"    />
-        <result property="payeeId"    column="payeeId"    />
-        <result property="payeeRole"    column="payeeRole"    />
-        <result property="suiteId"    column="suiteId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodName"    column="prodName"    />
-        <result property="pprId"    column="pprId"    />
-        <result property="pprName"    column="pprName"    />
-        <result property="mateId"    column="mateId"    />
-        <result property="mateName"    column="mateName"    />
-        <result property="prodType"    column="prodType"    />
-        <result property="orgProdId"    column="orgProdId"    />
-        <result property="surfaceQty"    column="surfaceQty"    />
-        <result property="unitQty"    column="unitQty"    />
-        <result property="orderQty"    column="orderQty"    />
-        <result property="price"    column="price"    />
-        <result property="returnQty"    column="returnQty"    />
-        <result property="finishTime"    column="finishTime"    />
-        <result property="orderStatus"    column="orderStatus"    />
-        <result property="invoiceTime"    column="invoiceTime"    />
-        <result property="invoiceStatus"    column="invoiceStatus"    />
-        <result property="invoiceBatchNo"    column="invoiceBatchNo"    />
-        <result property="invoiceBillNo"    column="invoiceBillNo"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-
-    <sql id="selectInvoiceOrderVo">
-        select
-            id,
-            orderId,
-            orderNo,
-            orderDetailId,
-            buyerId,
-            buyerRole,
-            tradeType,
-            sellerId,
-            sellerRole,
-            payeeId,
-            payeeRole,
-            suiteId,
-            prodId,
-            prodName,
-            pprId,
-            pprName,
-            mateId,
-            mateName,
-            prodType,
-            orgProdId,
-            surfaceQty,
-            unitQty,
-            orderQty,
-            price,
-            returnQty,
-            finishTime,
-            orderStatus,
-            invoiceTime,
-            invoiceStatus,
-            invoiceBatchNo,
-            invoiceBillNo,
-            delFlag,
-            createUser,
-            createTime,
-            updateUser,
-            updateTime
-        from t_invoice_order
-    </sql>
-
-    <update id="updateInvoiceOrderReturnQty" parameterType="InvoiceOrder">
-        update t_invoice_order
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="returnQty != null">returnQty = returnQty - #{returnQty},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where delFlag = '0'
-            <if test="id != null "> and id = #{id}</if>
-            <if test="orderId != null "> and orderId = #{orderId}</if>
-            <if test="orderNo != null  and orderNo != ''"> and orderNo = #{orderNo}</if>
-            <if test="orderDetailId != null "> and orderDetailId = #{orderDetailId}</if>
-            <if test="buyerId != null "> and buyerId = #{buyerId}</if>
-            <if test="buyerRole != null  and buyerRole != ''"> and buyerRole = #{buyerRole}</if>
-            <if test="tradeType != null  and tradeType != ''"> and tradeType = #{tradeType}</if>
-            <if test="sellerId != null "> and sellerId = #{sellerId}</if>
-            <if test="sellerRole != null  and sellerRole != ''"> and sellerRole = #{sellerRole}</if>
-            <if test="payeeId != null "> and payeeId = #{payeeId}</if>
-            <if test="payeeRole != null  and payeeRole != ''"> and payeeRole = #{payeeRole}</if>
-            <if test="suiteId != null  and suiteId != ''"> and suiteId = #{suiteId}</if>
-            <if test="prodId != null "> and prodId = #{prodId}</if>
-            <if test="pprId != null "> and pprId = #{pprId}</if>
-            <if test="mateId != null "> and mateId = #{mateId}</if>
-            <if test="prodType != null  and prodType != ''"> and prodType = #{prodType}</if>
-            <if test="orgProdId != null "> and orgProdId = #{orgProdId}</if>
-            <if test="orderStatus != null  and orderStatus != ''"> and orderStatus = #{orderStatus}</if>
-            <if test="invoiceStatus != null  and invoiceStatus != ''"> and invoiceStatus = #{invoiceStatus}</if>
-            <if test="invoiceBatchNo != null  and invoiceBatchNo != ''"> and invoiceBatchNo = #{invoiceBatchNo}</if>
-            <if test="invoiceBillNo != null  and invoiceBillNo != ''"> and invoiceBillNo = #{invoiceBillNo}</if>
-    </update>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/order/OrderDetailMqMapper.xml

@@ -3,74 +3,6 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xingxi.mq.server.order.mapper.OrderDetailMqMapper">
-    
-    <resultMap type="OrderDetail" id="OrderDetailVoResult">
-        <result property="orderDetailId"    column="orderDetailId"    />
-        <result property="orderId"    column="orderId"    />
-        <result property="suiteId"    column="suiteId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodName"    column="prodName"    />
-        <result property="prodPropId"    column="prodPropId"    />
-        <result property="prodPropName"    column="prodPropName"    />
-        <result property="orgProdId"    column="orgProdId"    />
-        <result property="prodType"    column="prodType"    />
-        <result property="mateId"    column="mateId"    />
-        <result property="mateName"    column="mateName"    />
-        <result property="mateType"    column="mateType"    />
-        <result property="vendorId"    column="vendorId"    />
-        <result property="buyQty"    column="buyQty"    />
-        <result property="afterQty"    column="afterQty"    />
-        <result property="returnQty"    column="returnQty"    />
-        <result property="buyPrice"    column="buyPrice"    />
-        <result property="salePrice"    column="salePrice"    />
-        <result property="expressName"    column="expressName"    />
-        <result property="expressNo"    column="expressNo"    />
-        <result property="expressTime"    column="expressTime"    />
-        <result property="receiveTime"    column="receiveTime"    />
-        <result property="confirmTime"    column="confirm_time"    />
-        <result property="finishTime"    column="finishTime"    />
-        <result property="orderDetailStatus"    column="orderDetailStatus"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectOrderDetailVo">
-        select
-            o.orderDetailId,
-            o.orderId,
-            o.suiteId,
-            o.prodId,
-            o.prodName,
-            o.prodPropId,
-            o.prodPropName,
-            o.orgProdId,
-            o.prodType,
-            o.mateId,
-            o.mateName,
-            o.mateType,
-            o.vendorId,
-            o.buyQty,
-            o.afterQty,
-            o.returnQty,
-            o.buyPrice,
-            o.salePrice,
-            o.expressName,
-            o.expressNo,
-            o.expressTime,
-            o.receiveTime,
-            o.confirm_time,
-            o.finishTime,
-            o.orderDetailStatus,
-            o.delFlag,
-            o.createUser,
-            o.createTime,
-            o.updateUser,
-            o.updateTime
-        from t_order_detail o
-    </sql>
 
     <select id="checkOrderFinished" resultType="int">
 		select count(1) from t_order_detail

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/product/MqProdInventoryMapper.xml

@@ -0,0 +1,38 @@
+<?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.xingxi.mq.server.order.mapper.MqProdInventoryMapper">
+
+    <select id="selectProdInventoryLock" resultType="ProdInventory">
+        SELECT tpi.*
+        FROM t_prod_inventory tpi
+        WHERE tpi.delFlag = '0'
+          AND tpi.mercId = #{mercId}
+          AND tpi.prodId = #{prodId}
+          AND tpi.prodAttrId = #{prodAttrId}
+        LIMIT 1
+        FOR UPDATE
+    </select>
+
+    <update id="updateSubtractProdStock" parameterType="ProdInventory">
+        update t_prod_inventory
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="availQty != null">availQty = availQty - #{availQty},</if>
+            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where prodInventoryId = #{prodInventoryId} and availQty - #{availQty} >= 0
+    </update>
+
+    <update id="updatePlusProdStock" parameterType="ProdInventory">
+        update t_prod_inventory
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="availQty != null">availQty = availQty + #{availQty},</if>
+            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where prodInventoryId = #{prodInventoryId}
+    </update>
+
+</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/product/ProdMateMqMapper.xml

@@ -1,62 +0,0 @@
-<?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.xingxi.mq.server.product.mapper.ProdMateMqMapper">
-    
-    <resultMap type="ProdMateMq" id="ProdMateMqResult">
-        <result property="prodMateId"    column="prodMateId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="pprId"    column="pprId"    />
-        <result property="surfaceSeq"    column="surfaceSeq"    />
-        <result property="designName"    column="designName"    />
-        <result property="mateId"    column="mateId"    />
-        <result property="mateQty"    column="mateQty"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-
-        <result property="mateName"    column="mateName"    />
-    </resultMap>
-
-    <sql id="selectProdMateMq">
-        select
-            p.prodMateId,
-            p.prodId,
-            p.pprId,
-            p.surfaceSeq,
-            p.designName,
-            p.mateId,
-            p.mateQty,
-            p.delFlag,
-            p.createUser,
-            p.createTime,
-            p.updateUser,
-            p.updateTime
-        from m_prod_mate p
-    </sql>
-
-    <select id="selectProdMateUnitQty" parameterType="ProdMateMq" resultMap="ProdMateMqResult">
-        select
-            p.prodId,
-            p.pprId,
-            p.mateId,
-            max(m.mateName) mateName,
-            sum(p.mateQty) mateQty
-        from m_prod_mate p
-            inner join m_material m on p.mateId = m.mateId
-        where p.delFlag = '0'
-            <if test="prodId != null "> and p.prodId = #{prodId}</if>
-            <if test="pprId != null "> and p.pprId = #{pprId}</if>
-        group by p.prodId, p.pprId, p.mateId
-    </select>
-
-    <select id="selectProdMateSurfaceQty" resultType="int">
-        select count(distinct surfaceSeq)
-        from m_prod_mate
-        where delFlag = '0' and prodId = #{prodId} and pprId = #{pprId}
-    </select>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/product/ProdPriceMqMapper.xml

@@ -1,57 +0,0 @@
-<?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.xingxi.mq.server.product.mapper.ProdPriceMqMapper">
-
-    <resultMap type="ProdPrice" id="ProdPriceMqResult">
-        <result property="prodPriceId"    column="prodPriceId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="pprId"    column="pprId"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="buyerRoleKey"    column="buyerRoleKey"    />
-        <result property="salesmanId"    column="salesmanId"    />
-        <result property="salesmanRoleKey"    column="salesmanRoleKey"    />
-        <result property="costItemKey"    column="costItemKey"    />
-        <result property="surfaceQty"    column="surfaceQty"    />
-        <result property="price"    column="price"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectProdPriceMq">
-        select
-            p.prodPriceId,
-            p.prodId,
-            p.pprId,
-            p.buyerId,
-            p.buyerRoleKey,
-            p.salesmanId,
-            p.salesmanRoleKey,
-            p.costItemKey,
-            p.surfaceQty,
-            p.price,
-            p.delFlag,
-            p.createUser,
-            p.createTime,
-            p.updateUser,
-            p.updateTime
-        from m_prod_price p
-            inner join m_cost_item c on p.costItemKey = c.costItemKey
-    </sql>
-
-    <select id="getProdPriceByUnionId" parameterType="ProdPrice" resultType="BigDecimal">
-        SELECT sum(p.price) price
-        FROM m_prod_price p
-            inner join m_cost_item c on p.costItemKey = c.costItemKey
-        WHERE p.delFlag = '0'
-            and p.prodId = #{prodId}
-            and p.pprId = #{pprId}
-            and p.buyerId = #{buyerId}
-            and p.salesmanId = #{salesmanId}
-            and (case when c.singleFlag = '0' then p.surfaceQty = #{surfaceQty} else 1 end)
-    </select>
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/product/ProdStockVoMapper.xml

@@ -1,135 +0,0 @@
-<?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.xingxi.mq.server.product.mapper.ProdStockVoMapper">
-    
-    <resultMap type="ProdStockVo" id="ProdStockVoResult">
-        <result property="stockId"    column="stockId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="pprId"    column="pprId"    />
-        <result property="vendorId"    column="vendorId"    />
-        <result property="stockQty"    column="stockQty"    />
-        <result property="availQty"    column="availQty"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-
-        <result property="prodkindId"    column="prodkindId"    />
-        <result property="prodkindName"    column="prodkindName"    />
-        <result property="prodName"    column="prodName"    />
-        <result property="pprName"    column="pprName"    />
-
-    </resultMap>
-
-    <sql id="selectProdStockVo">
-        select
-            p.stockId,
-            p.prodId,
-            p.pprId,
-            p.vendorId,
-            p.stockQty,
-            p.availQty,
-            p.delFlag,
-            p.createUser,
-            p.createTime,
-            p.updateUser,
-            p.updateTime,
-            pp.prodName,
-            mp.prodkindId,
-            pk.prodkindName,
-            ppr.pprName
-        from t_prod_stock p
-            inner join m_prod pp on p.prodId = pp.prodId
-            inner join m_merc_prod mp on p.prodId = mp.prodId and p.vendorId = mp.mercId
-            inner join m_prodkind pk on mp.prodkindId = pk.prodkindId
-            inner join m_prod_prop_relation ppr on p.pprId = ppr.pprId
-    </sql>
-
-    <select id="selectProdStockVoList" parameterType="ProdStockVo" resultMap="ProdStockVoResult">
-        <include refid="selectProdStockVo"/>
-        <where>
-            <if test="prodkindId != null "> and mp.prodkindId = #{prodkindId}</if>
-            <if test="prodId != null "> and p.prodId = #{prodId}</if>
-            <if test="prodName != null  and prodName != ''"> and pp.prodName like concat('%', #{prodName}, '%')</if>
-            <if test="pprId != null "> and p.pprId = #{pprId}</if>
-            <if test="vendorId != null "> and p.vendorId = #{vendorId}</if>
-            <if test="stockQty != null "> and p.stockQty = #{stockQty}</if>
-            <if test="availQty != null "> and p.availQty = #{availQty}</if>
-            <if test="delFlag != null  and delFlag != ''"> and p.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and p.createUser = #{createUser}</if>
-            <if test="createTime != null "> and p.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and p.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and p.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectProdStockVoByStockId" parameterType="Long" resultMap="ProdStockVoResult">
-        <include refid="selectProdStockVo"/>
-        where p.stockId = #{stockId}
-    </select>
-
-    <select id="selectProdStockVoByUnionId" parameterType="ProdStockVo" resultMap="ProdStockVoResult">
-        select stockId, prodId, pprId, vendorId, stockQty, availQty, delFlag, createUser, createTime, updateUser, updateTime
-        from t_prod_stock
-        where prodId = #{prodId} and pprId = #{pprId} and vendorId = #{vendorId}
-        limit 1
-    </select>
-
-    <update id="updateProdStockQty" parameterType="ProdStockVo">
-        update t_prod_stock
-        <trim prefix="SET" suffixOverrides=",">
-            <if test='billType != null and billType == "1"  and stockQty != null'>
-                stockQty = ifnull(stockQty, 0) + #{stockQty},
-            </if>
-            <if test='billType != null and billType == "0" and stockQty != null'>
-                stockQty = ifnull(stockQty, 0) - #{stockQty},
-            </if>
-            <if test='billType != null and billType == "1" and availQty != null'>
-                availQty = ifnull(availQty, 0) + #{availQty},
-            </if>
-            <if test='billType != null and billType == "0" and availQty != null'>
-                availQty = ifnull(availQty, 0) - #{availQty},
-            </if>
-            <if test="updateUser != null and updateUser != ''  ">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where stockId = #{stockId}
-            <if test='billType != null and billType == "0" and stockQty != null'>
-                and stockQty - #{stockQty} >= 0
-            </if>
-            <if test='billType != null and billType == "0" and availQty != null'>
-                and availQty - #{availQty} >= 0
-            </if>
-    </update>
-
-    <update id="updateProdStockQtyByUnionId" parameterType="ProdStockVo">
-        update t_prod_stock
-        <trim prefix="SET" suffixOverrides=",">
-            <if test='billType != null and billType == "1"  and stockQty != null'>
-                stockQty = ifnull(stockQty, 0) + #{stockQty},
-            </if>
-            <if test='billType != null and billType == "0" and stockQty != null'>
-                stockQty = ifnull(stockQty, 0) - #{stockQty},
-            </if>
-            <if test='billType != null and billType == "1" and availQty != null'>
-                availQty = ifnull(availQty, 0) + #{availQty},
-            </if>
-            <if test='billType != null and billType == "0" and availQty != null'>
-                availQty = ifnull(availQty, 0) - #{availQty},
-            </if>
-            <if test="updateUser != null and updateUser != ''  ">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where prodId = #{prodId} and pprId = #{pprId} and vendorId = #{vendorId}
-            <if test='billType != null and billType == "0" and stockQty != null'>
-                and stockQty - #{stockQty} >= 0
-            </if>
-            <if test='billType != null and billType == "0" and availQty != null'>
-                and availQty - #{availQty} >= 0
-            </if>
-    </update>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/report/CommissionMoneyDayVoMapper.xml

@@ -1,58 +0,0 @@
-<?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.xingxi.mq.server.report.mapper.CommissionMoneyDayVoMapper">
-    
-    <resultMap type="CommissionMoneyDay" id="CommissionMoneyDayResult">
-        <result property="id"    column="id"    />
-        <result property="commissionDay"    column="commissionDay"    />
-        <result property="referrerId"    column="referrerId"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="commissionAmount"    column="commissionAmount"    />
-        <result property="orderAmount"    column="orderAmount"    />
-        <result property="businessCategory"    column="businessCategory"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectCommissionMoneyDay">
-        select
-            c.id,
-            c.commissionDay,
-            c.referrerId,
-            c.buyerId,
-            c.sellerId,
-            c.commissionAmount,
-            c.orderAmount,
-            c.businessCategory,
-            c.delFlag,
-            c.createUser,
-            c.createTime,
-            c.updateUser,
-            c.updateTime
-        from t_commission_money_day c
-    </sql>
-
-    <update id="updateCommissionMoneyDay" parameterType="CommissionMoneyDay">
-        update t_commission_money_day
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="commissionDay != null">commissionDay = #{commissionDay},</if>
-            <if test="referrerId != null">referrerId = #{referrerId},</if>
-            <if test="buyerId != null">buyerId = #{buyerId},</if>
-            <if test="sellerId != null">sellerId = #{sellerId},</if>
-            <if test="commissionAmount != null">commissionAmount = commissionAmount + #{commissionAmount},</if>
-            <if test="orderAmount != null">orderAmount = orderAmount + #{orderAmount},</if>
-            <if test="businessCategory != null and businessCategory != ''">businessCategory = #{businessCategory},</if>
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/report/CommissionMoneyMonthVoMapper.xml

@@ -1,61 +0,0 @@
-<?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.xingxi.mq.server.report.mapper.CommissionMoneyMonthVoMapper">
-
-    <resultMap type="CommissionMoneyMonth" id="CommissionMoneyMonthVoResult">
-        <result property="id"    column="id"    />
-        <result property="commissionYear"    column="commissionYear"    />
-        <result property="commissionMonth"    column="commissionMonth"    />
-        <result property="referrerId"    column="referrerId"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="commissionAmount"    column="commissionAmount"    />
-        <result property="orderAmount"    column="orderAmount"    />
-        <result property="businessCategory"    column="businessCategory"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectCommissionMoneyMonthVo">
-        select
-            c.id,
-            c.commissionYear,
-            c.commissionMonth,
-            c.referrerId,
-            c.buyerId,
-            c.sellerId,
-            c.commissionAmount,
-            c.orderAmount,
-            c.businessCategory,
-            c.delFlag,
-            c.createUser,
-            c.createTime,
-            c.updateUser,
-            c.updateTime
-        from t_commission_money_month c
-    </sql>
-
-    <update id="updateCommissionMoneyMonth" parameterType="CommissionMoneyMonth">
-        update t_commission_money_month
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="commissionYear != null and commissionYear != ''">commissionYear = #{commissionYear},</if>
-            <if test="commissionMonth != null and commissionMonth != ''">commissionMonth = #{commissionMonth},</if>
-            <if test="referrerId != null">referrerId = #{referrerId},</if>
-            <if test="buyerId != null">buyerId = #{buyerId},</if>
-            <if test="sellerId != null">sellerId = #{sellerId},</if>
-            <if test="commissionAmount != null">commissionAmount = commissionAmount + #{commissionAmount},</if>
-            <if test="orderAmount != null">orderAmount = orderAmount + #{orderAmount},</if>
-            <if test="businessCategory != null and businessCategory != ''">businessCategory = #{businessCategory},</if>
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-</mapper>

08.src/Xingxi/xingxi-mq-server/src/main/resources/mapper/system/SysDeptVoMapper.xml

@@ -1,50 +0,0 @@
-<?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.xingxi.mq.server.system.mapper.SysDeptVoMapper">
-
-    <resultMap type="SysDept" id="SysDeptResult">
-        <result property="deptId"    column="dept_id"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="ancestors"    column="ancestors"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="deptType"    column="deptType"    />
-        <result property="orderNum"    column="order_num"    />
-        <result property="leader"    column="leader"    />
-        <result property="phone"    column="phone"    />
-        <result property="email"    column="email"    />
-        <result property="status"    column="status"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createUser"    column="create_user"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateUser"    column="update_user"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectSysDept">
-        select
-            s.dept_id,
-            s.parent_id,
-            s.ancestors,
-            s.dept_name,
-            s.deptType,
-            s.order_num,
-            s.leader,
-            s.phone,
-            s.email,
-            s.status,
-            s.del_flag,
-            s.create_user,
-            s.create_time,
-            s.update_user,
-            s.update_time
-        from sys_dept s
-    </sql>
-
-    <select id="selectParentDeptByDeptId" parameterType="Long" resultMap="SysDeptResult">
-        <include refid="selectSysDept"/>
-        where s.dept_id = (select parent_id from sys_dept where dept_id = #{deptId})
-    </select>
-
-</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -194,6 +194,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="pwdUpdateDate != null">pwd_update_date = #{pwdUpdateDate},</if>
  			<if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="wxOpenId != null and wxOpenId != ''">wx_open_id = #{wxOpenId},</if>
+			<if test="wxUnionId != null and wxUnionId != ''">wx_union_id = #{wxUnionId},</if>
+			<if test="wxSessionKey != null and wxSessionKey != ''">wx_session_key = #{wxSessionKey},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}
@@ -216,7 +219,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="pwdUpdateDate != null">pwd_update_date,</if>
  			<if test="createUser != null and createUser != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
- 			create_time
+			<if test="loginDate != null">login_date,</if>
+			<if test="wxOpenId != null and wxOpenId != ''">wx_open_id,</if>
+			<if test="wxUnionId != null and wxUnionId != ''">wx_union_id,</if>
+			<if test="wxSessionKey != null and wxSessionKey != ''">wx_session_key,</if>
+		create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
  			<if test="deptId != null and deptId != ''">#{deptId},</if>
@@ -233,7 +240,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
  			<if test="createUser != null and createUser != ''">#{createUser},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
+			<if test="loginDate != null">#{loginDate},</if>
+			<if test="wxOpenId != null and wxOpenId != ''">#{wxOpenId},</if>
+			<if test="wxUnionId != null and wxUnionId != ''">#{wxUnionId},</if>
+			<if test="wxSessionKey != null and wxSessionKey != ''">#{wxSessionKey},</if>
+			sysdate()
  		)
 	</insert>