2025 last commit happy new year

dengwei
1 parent 0e68a92c
Showing 11 changed files with 112 additions and 26 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/RtMallOrderApi.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/RtMallOrderRefundApi.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/OrderCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/OrderItemCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizOrder.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizOrderItem.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizOrderServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizRefundServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/sourcechannel/AbstractSourceChannel.java
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizOrderDao.xml
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizOrderItemDao.xml
@@ -9,6 +9,7 @@ import com.diligrp.cashier.mall.domain.rtmall.vo.OrderStatusCallbackVO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.OrderSuccessVO;
 import com.diligrp.cashier.mall.service.biz.MallBizOrderService;
 import com.diligrp.cashier.mall.sign.RtMallSign;
+import com.diligrp.cashier.mall.type.OrderType;
 import com.diligrp.cashier.mall.util.RtMallValidateUtils;
 import com.diligrp.cashier.shared.annotation.ParamLogPrint;
 import com.diligrp.cashier.shared.annotation.RepeatSubmit;
@@ -16,7 +17,6 @@ import com.diligrp.cashier.shared.annotation.Sign;
 import com.diligrp.cashier.shared.handler.duplication.SpelDuplicationSubmit;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -48,8 +48,9 @@ public class RtMallOrderApi {
     @ParamLogPrint(outPrint = true)
     @Sign(sign = RtMallSign.class)
     @RepeatSubmit(prefix = "order_sync:", value = "#req['order_id']", duplicationSubmit = SpelDuplicationSubmit.class)
-    public RtMarkMessage<OrderSuccessVO> createOrder(@Valid @RequestBody Object req) {
+    public RtMarkMessage<OrderSuccessVO> createOrder(@RequestBody Object req) {
         OrderCO orderCo = JsonUtils.convertValue(req, OrderCO.class);
+        orderCo.setOrderType(OrderType.MINI_PROGRAM.code);
         RtMallValidateUtils.valid(orderCo);
         return RtMarkMessage.success(mallBizOrderService.createOrder(List.of(orderCo)));
     }
@@ -62,7 +63,7 @@ public class RtMallOrderApi {
     @PostMapping("/order/v1/info")
     @ParamLogPrint(outPrint = true)
     @Sign(sign = RtMallSign.class)
-    public RtMarkMessage<OrderPaymentVO> info(@Valid @RequestBody Object req) {
+    public RtMarkMessage<OrderPaymentVO> info(@RequestBody Object req) {
         OrderInfoCO orderInfoCo = JsonUtils.convertValue(req, OrderInfoCO.class);
         RtMallValidateUtils.valid(orderInfoCo);
         return RtMarkMessage.success(mallBizOrderService.info(orderInfoCo));
@@ -77,7 +78,7 @@ public class RtMallOrderApi {
     @ParamLogPrint(outPrint = true)
     @Sign(sign = RtMallSign.class)
     @RepeatSubmit(prefix = "status_callback:", value = "#req['order_id']", duplicationSubmit = SpelDuplicationSubmit.class)
-    public RtMarkMessage<OrderStatusCallbackVO> statusCallback(@Valid @RequestBody Object req) {
+    public RtMarkMessage<OrderStatusCallbackVO> statusCallback(@RequestBody Object req) {
         OrderStatusCallbackCO orderStatusCallback = JsonUtils.convertValue(req, OrderStatusCallbackCO.class);
         RtMallValidateUtils.valid(orderStatusCallback);
         return RtMarkMessage.success(mallBizOrderService.statusCallback(orderStatusCallback));
@@ -3,8 +3,8 @@ package com.diligrp.cashier.mall.api;
 import com.diligrp.cashier.mall.domain.rtmall.RtMarkMessage;
 import com.diligrp.cashier.mall.domain.rtmall.co.RefundCO;
 import com.diligrp.cashier.mall.domain.rtmall.co.RefundStatusCO;
-import com.diligrp.cashier.mall.domain.rtmall.vo.RefundVO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.RefundSuccessVO;
+import com.diligrp.cashier.mall.domain.rtmall.vo.RefundVO;
 import com.diligrp.cashier.mall.service.biz.MallBizRefundService;
 import com.diligrp.cashier.mall.sign.RtMallSign;
 import com.diligrp.cashier.mall.util.RtMallValidateUtils;
@@ -14,7 +14,6 @@ import com.diligrp.cashier.shared.annotation.Sign;
 import com.diligrp.cashier.shared.handler.duplication.SpelDuplicationSubmit;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -43,7 +42,7 @@ public class RtMallOrderRefundApi {
     @ParamLogPrint(outPrint = true)
     @Sign(sign = RtMallSign.class)
     @RepeatSubmit(prefix = "refund:", value = "#req['order_id']", duplicationSubmit = SpelDuplicationSubmit.class)
-    public RtMarkMessage<RefundSuccessVO> refund(@Valid @RequestBody Object req) {
+    public RtMarkMessage<RefundSuccessVO> refund(@RequestBody Object req) {
         RefundCO refundCo = JsonUtils.convertValue(req, RefundCO.class);
         RtMallValidateUtils.valid(refundCo);
         return RtMarkMessage.success(mallBizRefundService.refund(refundCo));
@@ -57,7 +56,7 @@ public class RtMallOrderRefundApi {
     @PostMapping("/refund/v1/info")
     @ParamLogPrint(outPrint = true)
     @Sign(sign = RtMallSign.class)
-    public RtMarkMessage<RefundVO> info(@Valid @RequestBody Object req) {
+    public RtMarkMessage<RefundVO> info(@RequestBody Object req) {
         RefundStatusCO refundStatusCo = JsonUtils.convertValue(req, RefundStatusCO.class);
         RtMallValidateUtils.valid(refundStatusCo);
         return RtMarkMessage.success(mallBizRefundService.info(refundStatusCo));
@@ -42,6 +42,8 @@ public class OrderCO extends RtMarkBaseCO {
     @NotNull(message = "freight_fee is required")
     private Long freightFee;
  
+    private Long discountFee;
+
     @NotBlank(message = "shop_code is required")
     private String shopCode;
  
@@ -53,6 +55,12 @@ public class OrderCO extends RtMarkBaseCO {
  
     private ReceiverInfoCO receiverInfo;
  
+    /**
+     * 订单类型
+     * @see com.diligrp.cashier.mall.type.OrderType
+     */
+    private Integer orderType;
+
     public String getOrderId() {
         return orderId;
     }
@@ -117,6 +125,14 @@ public class OrderCO extends RtMarkBaseCO {
         this.freightFee = freightFee;
     }
  
+    public Long getDiscountFee() {
+        return discountFee;
+    }
+
+    public void setDiscountFee(Long discountFee) {
+        this.discountFee = discountFee;
+    }
+
     public String getShopCode() {
         return shopCode;
     }
@@ -148,4 +164,12 @@ public class OrderCO extends RtMarkBaseCO {
     public void setReceiverInfo(ReceiverInfoCO receiverInfo) {
         this.receiverInfo = receiverInfo;
     }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
 }
@@ -25,6 +25,8 @@ public class OrderItemCO {
     @NotNull(message = "amount is required")
     private Long amount;
  
+    private Long discountFee;
+
     @NotBlank(message = "item_bn is required")
     private String itemBn;
  
@@ -72,6 +74,14 @@ public class OrderItemCO {
         this.amount = amount;
     }
  
+    public Long getDiscountFee() {
+        return discountFee;
+    }
+
+    public void setDiscountFee(Long discountFee) {
+        this.discountFee = discountFee;
+    }
+
     public String getItemBn() {
         return itemBn;
     }
@@ -101,6 +101,11 @@ public class MallBizOrder extends BaseDO {
     private Long freightFee;
  
     /**
+     * 优惠金额(分)
+     */
+    private Long discountFee;
+
+    /**
      * 订单状态(0-notpay-未支付-1-payed-已支付 2-notpaycancel-未支付取消 3-payedcancel-已支付取消  4-done-订单完成 5-buyer_confirm-待用户收货)
      * @see OrderState
      */
@@ -254,6 +259,14 @@ public class MallBizOrder extends BaseDO {
         this.freightFee = freightFee;
     }
  
+    public Long getDiscountFee() {
+        return discountFee;
+    }
+
+    public void setDiscountFee(Long discountFee) {
+        this.discountFee = discountFee;
+    }
+
     public Integer getState() {
         return state;
     }
@@ -59,6 +59,11 @@ public class MallBizOrderItem extends BaseDO {
     private Long amount;
  
     /**
+     * 优惠金额(分)
+     */
+    private Long discountFee;
+
+    /**
      * 商品图片
      */
     private String pic;
@@ -158,6 +163,14 @@ public class MallBizOrderItem extends BaseDO {
         this.amount = amount;
     }
  
+    public Long getDiscountFee() {
+        return discountFee;
+    }
+
+    public void setDiscountFee(Long discountFee) {
+        this.discountFee = discountFee;
+    }
+
     public String getPic() {
         return pic;
     }
@@ -17,6 +17,7 @@ import com.diligrp.cashier.mall.exception.RtMartMallException;
 import com.diligrp.cashier.mall.model.*;
 import com.diligrp.cashier.mall.service.biz.MallBizOrderService;
 import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
+import com.diligrp.cashier.mall.type.OrderState;
 import com.diligrp.cashier.mall.type.RtMarkErrorCode;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import jakarta.annotation.Resource;
@@ -62,7 +63,7 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public OrderSuccessVO createOrder(List<OrderCO> orderCos) {
-        AuthLoginCO authLogin = getAuthLogin(orderCos.getFirst().getUserCode());
+        AuthLoginCO authLogin = getAuthLogin(orderCos.getFirst().getUserCode(), orderCos.getFirst().getOrderType());
  
         // order
         List<MallBizOrder> mallBizOrders = MallBizOrder.of(orderCos, authLogin);
@@ -97,9 +98,9 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public OrderStatusCallbackVO statusCallback(OrderStatusCallbackCO orderStatusCallback) {
-        // update order status
         MallBizOrder mallBizOrder = getByOrderId(orderStatusCallback.getOrderId());
  
+        // update order status
         MallBizOrder update = mallBizOrder.ofUpdateState(orderStatusCallback);
         int num = mallBizOrderDao.updateByPrimaryKeySelective(update);
         if (num < 1) {
@@ -109,14 +110,21 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         MallBizPaymentOrder mallBizPaymentOrder = new MallBizPaymentOrder();
         BeanUtils.copyProperties(orderStatusCallback, mallBizPaymentOrder);
         mallBizPaymentOrder = mallBizPaymentService.paymentOrderInfo(mallBizPaymentOrder);
+
+        // 已支付取消退款 已支付取消 需要退款
+        if (Objects.equals(mallBizOrder.getState(), OrderState.PAYED.getCode())
+                && Objects.equals(orderStatusCallback.getOrderStatus(), OrderState.PAYED_CANCEL.getKey())) {
+            // 2025/12/31: 退款 暂时不需要 需要退款申请
+        }
         return new OrderStatusCallbackVO(mallBizPaymentOrder.getPayTradeNo());
     }
  
     /**
      * getAuthLogin
+     * userCode = userCode + "_" + channel
      */
-    private AuthLoginCO getAuthLogin(String userCode) {
-        Object cache = redisTemplate.opsForValue().get(MallConstants.MALL_USER_INFO + userCode);
+    private AuthLoginCO getAuthLogin(String userCode, Integer orderType) {
+        Object cache = redisTemplate.opsForValue().get(MallConstants.MALL_USER_INFO + userCode + "_" + orderType);
         if (Objects.isNull(cache)) {
             throw new RtMartMallException(RtMarkErrorCode.E5001);
         }
@@ -5,11 +5,10 @@ import com.diligrp.cashier.mall.dao.MallBizOrderDao;
 import com.diligrp.cashier.mall.dao.MallBizRefundDao;
 import com.diligrp.cashier.mall.domain.rtmall.co.RefundCO;
 import com.diligrp.cashier.mall.domain.rtmall.co.RefundStatusCO;
-import com.diligrp.cashier.mall.domain.rtmall.vo.RefundVO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.RefundSuccessVO;
+import com.diligrp.cashier.mall.domain.rtmall.vo.RefundVO;
 import com.diligrp.cashier.mall.exception.RtMartMallException;
 import com.diligrp.cashier.mall.model.MallBizOrder;
-import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
 import com.diligrp.cashier.mall.model.MallBizRefund;
 import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
@@ -43,7 +42,7 @@ public class MallBizRefundServiceImpl implements MallBizRefundService {
  
     /**
      * refund
-     * 退款成功回调
+     * 申请退款接口
      */
     @Override
     @Transactional(rollbackFor = {Exception.class})
@@ -66,8 +66,8 @@ public abstract class AbstractSourceChannel {
         String tokenKey = MallConstants.MALL_TOKEN + token;
         redisTemplate.opsForValue().set(tokenKey, JsonUtils.toJsonString(authLogin), 1, TimeUnit.DAYS);
  
-        // 用户信息缓存 中瑞、dili是独立系统部署 可能存在相同用户id 所以需要加上渠道
-        String userKey = MallConstants.MALL_USER_INFO + authLogin.getUserCode() + "_" + authLogin.getChannel();
+        // 用户信息缓存 中瑞、dili是独立系统部署 可能存在相同用户id 所以需要加上渠道 可能同时存在操作扫码和扫码购-订单类型
+        String userKey = MallConstants.MALL_USER_INFO + authLogin.getUserCode() + "_" + authLogin.getChannel() + "_" + authLogin.getOrderType();
         redisTemplate.opsForValue().set(userKey, JsonUtils.toJsonString(authLogin), 1, TimeUnit.DAYS);
         return authUrl;
     }
@@ -17,6 +17,7 @@
     <result column="shop_name" jdbcType="VARCHAR" property="shopName" />
     <result column="total_amount" jdbcType="BIGINT" property="totalAmount" />
     <result column="freight_fee" jdbcType="BIGINT" property="freightFee" />
+    <result column="discount_fee" jdbcType="BIGINT" property="discountFee" />
     <result column="state" jdbcType="TINYINT" property="state" />
     <result column="rtmart_state" jdbcType="TINYINT" property="rtmartState" />
     <result column="order_time" jdbcType="TIMESTAMP" property="orderTime" />
@@ -28,7 +29,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     id, order_no, order_id, trade_id, channel, mch_id, source, order_type, user_code,
-    username, company_code, shop_code, shop_name, total_amount, freight_fee, state,
+    username, company_code, shop_code, shop_name, total_amount, freight_fee, discount_fee, state,
     rtmart_state, order_time, order_expire, version, created_time, modifier_name, modified_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -47,15 +48,15 @@
       source, order_type, user_code,
       username, company_code, shop_code,
       shop_name, total_amount, freight_fee,
-      state, rtmart_state, order_time,
-      order_expire)
+      discount_fee, state, rtmart_state,
+      order_time, order_expire)
     values (#{id,jdbcType=BIGINT}, #{orderNo,jdbcType=VARCHAR}, #{orderId,jdbcType=VARCHAR},
       #{tradeId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR},
       #{source,jdbcType=TINYINT}, #{orderType,jdbcType=TINYINT}, #{userCode,jdbcType=VARCHAR},
       #{username,jdbcType=VARCHAR}, #{companyCode,jdbcType=VARCHAR}, #{shopCode,jdbcType=VARCHAR},
       #{shopName,jdbcType=VARCHAR}, #{totalAmount,jdbcType=BIGINT}, #{freightFee,jdbcType=BIGINT},
-      #{state,jdbcType=TINYINT}, #{rtmartState,jdbcType=TINYINT}, #{orderTime,jdbcType=TIMESTAMP},
-      #{orderExpire,jdbcType=INTEGER})
+      #{discountFee,jdbcType=BIGINT}, #{state,jdbcType=TINYINT}, #{rtmartState,jdbcType=TINYINT},
+      #{orderTime,jdbcType=TIMESTAMP}, #{orderExpire,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.diligrp.cashier.mall.model.MallBizOrder">
     insert into mall_biz_order
@@ -105,6 +106,9 @@
       <if test="freightFee != null">
         freight_fee,
       </if>
+      <if test="discountFee != null">
+        discount_fee,
+      </if>
       <if test="state != null">
         state,
       </if>
@@ -173,6 +177,9 @@
       <if test="freightFee != null">
         #{freightFee,jdbcType=BIGINT},
       </if>
+      <if test="discountFee != null">
+        #{discountFee,jdbcType=BIGINT},
+      </if>
       <if test="state != null">
         #{state,jdbcType=TINYINT},
       </if>
@@ -241,6 +248,9 @@
       <if test="freightFee != null">
         freight_fee = #{freightFee,jdbcType=BIGINT},
       </if>
+      <if test="discountFee != null">
+        discount_fee = #{discountFee,jdbcType=BIGINT},
+      </if>
       <if test="state != null">
         state = #{state,jdbcType=TINYINT},
       </if>
@@ -284,6 +294,7 @@
       shop_name = #{shopName,jdbcType=VARCHAR},
       total_amount = #{totalAmount,jdbcType=BIGINT},
       freight_fee = #{freightFee,jdbcType=BIGINT},
+      discount_fee = #{discountFee,jdbcType=BIGINT},
       state = #{state,jdbcType=TINYINT},
       rtmart_state = #{rtmartState,jdbcType=TINYINT},
       order_time = #{orderTime,jdbcType=TIMESTAMP},
@@ -298,7 +309,7 @@
                                     source, order_type, user_code,
                                     username, company_code, shop_code,
                                     shop_name, total_amount, freight_fee,
-                                    order_time, order_expire)
+                                    discount_fee, order_time, order_expire)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.id,jdbcType=BIGINT},
@@ -316,6 +327,7 @@
             #{item.shopName,jdbcType=VARCHAR},
             #{item.totalAmount,jdbcType=BIGINT},
             #{item.freightFee,jdbcType=BIGINT},
+            #{item.discountFee,jdbcType=BIGINT},
             #{item.orderTime,jdbcType=TIMESTAMP},
             #{item.orderExpire,jdbcType=INTEGER})
         </foreach>
@@ -351,6 +363,9 @@
             <if test="freightFee != null">
                 freight_fee = #{freightFee,jdbcType=BIGINT},
             </if>
+            <if test="discountFee != null">
+                discount_fee = #{discountFee,jdbcType=BIGINT},
+            </if>
             <if test="state != null">
                 state = #{state,jdbcType=TINYINT},
             </if>
@@ -13,6 +13,7 @@
     <result column="num" jdbcType="INTEGER" property="num" />
     <result column="price" jdbcType="BIGINT" property="price" />
     <result column="amount" jdbcType="BIGINT" property="amount" />
+    <result column="discount_fee" jdbcType="BIGINT" property="discountFee" />
     <result column="pic" jdbcType="VARCHAR" property="pic" />
     <result column="tax_output_rate" jdbcType="VARCHAR" property="taxOutputRate" />
     <result column="tax_classification_code" jdbcType="VARCHAR" property="taxClassificationCode" />
@@ -20,7 +21,8 @@
   </resultMap>
   <sql id="Base_Column_List">
     id, biz_order_id, order_id, sub_order_id, shop_code, shop_name, item_bn, item_name,
-    num, price, amount, pic, tax_output_rate, tax_classification_code, tax_classification_name
+    num, price, amount, discount_fee, pic, tax_output_rate,
+    tax_classification_code, tax_classification_name
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select
@@ -36,13 +38,13 @@
     insert into mall_biz_order_item (id, biz_order_id, order_id,
       sub_order_id, shop_code, shop_name,
       item_bn, item_name, num,
-      price, amount, pic, tax_output_rate,
+      price, amount, discount_fee, pic, tax_output_rate,
       tax_classification_code, tax_classification_name
       )
     values (#{id,jdbcType=BIGINT}, #{bizOrderId,jdbcType=BIGINT}, #{orderId,jdbcType=VARCHAR},
       #{subOrderId,jdbcType=VARCHAR}, #{shopCode,jdbcType=VARCHAR}, #{shopName,jdbcType=VARCHAR},
       #{itemBn,jdbcType=VARCHAR}, #{itemName,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER},
-      #{price,jdbcType=BIGINT}, #{amount,jdbcType=BIGINT}, #{pic,jdbcType=VARCHAR}, #{taxOutputRate,jdbcType=VARCHAR},
+      #{price,jdbcType=BIGINT}, #{amount,jdbcType=BIGINT}, #{discountFee,jdbcType=BIGINT}, #{pic,jdbcType=VARCHAR}, #{taxOutputRate,jdbcType=VARCHAR},
       #{taxClassificationCode,jdbcType=VARCHAR}, #{taxClassificationName,jdbcType=VARCHAR}
       )
   </insert>
@@ -223,6 +225,7 @@
         num,
         price,
         amount,
+        discount_fee,
         pic,
         tax_output_rate,
         tax_classification_code,
@@ -240,6 +243,7 @@
         #{item.num,jdbcType=INTEGER},
         #{item.price,jdbcType=BIGINT},
         #{item.amount,jdbcType=BIGINT},
+        #{item.discountFee,jdbcType=BIGINT},
         #{item.pic,jdbcType=VARCHAR},
         #{item.taxOutputRate,jdbcType=VARCHAR},
         #{item.taxClassificationCode,jdbcType=VARCHAR},