添加管理员备注字段

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java

@@ -267,7 +267,7 @@ public class DbOrderController extends BaseController {
      * 生成支付订单和发起退款接口，驳回接口
      * 生成支付订单和发起退款接口，驳回接口
      */
      */
     @SaCheckPermission("xinrenli:order:createPay")
     @SaCheckPermission("xinrenli:order:createPay")
-    @Log(title = "报表", businessType = BusinessType.DELETE)
+    @Log(title = "报表", businessType = BusinessType.OTHER)
     @PostMapping("/createPay")
     @PostMapping("/createPay")
     public R<Void> createPay(@RequestBody DbOrderEditBo bo) {
     public R<Void> createPay(@RequestBody DbOrderEditBo bo) {
         if("2".equals(bo.getStatus())){
         if("2".equals(bo.getStatus())){

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/DbOrder.java

@@ -86,6 +86,10 @@ public class DbOrder {
      */
      */
     private Long useDiscountId;
     private Long useDiscountId;
     /**
     /**
+     * 管理员备注
+     */
+    private String adminRemark;
+    /**
      * 备注说明
      * 备注说明
      */
      */
     private String remark;
     private String remark;

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java

@@ -77,6 +77,11 @@ public class DbOrderBo extends BaseEntity {
     private BigDecimal actualAmount;
     private BigDecimal actualAmount;
 
 
     /**
     /**
+     * 管理员备注
+     */
+    private String adminRemark;
+
+    /**
      * 备注说明
      * 备注说明
      */
      */
     //@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})
     //@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderEditBo.java

@@ -76,6 +76,11 @@ public class DbOrderEditBo extends BaseEntity {
     private BigDecimal actualAmount;
     private BigDecimal actualAmount;
 
 
     /**
     /**
+     * 管理员备注
+     */
+    private String adminRemark;
+
+    /**
      * 备注说明
      * 备注说明
      */
      */
     //@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})
     //@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbOrderVo.java

@@ -84,6 +84,11 @@ public class DbOrderVo {
     @ExcelProperty(value = "退款金额")
     @ExcelProperty(value = "退款金额")
     private BigDecimal refundAmount;
     private BigDecimal refundAmount;
     /**
     /**
+     * 管理员备注
+     */
+    @ExcelProperty(value = "退款金额")
+    private String adminRemark;
+    /**
      * 备注说明
      * 备注说明
      */
      */
     @ExcelProperty(value = "备注说明")
     @ExcelProperty(value = "备注说明")

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java

@@ -19,6 +19,7 @@ import com.yongqi.common.core.domain.PageQuery;
 import com.yongqi.common.core.domain.R;
 import com.yongqi.common.core.domain.R;
 import com.yongqi.common.core.domain.model.LoginUser;
 import com.yongqi.common.core.domain.model.LoginUser;
 import com.yongqi.common.core.page.TableDataInfo;
 import com.yongqi.common.core.page.TableDataInfo;
+import com.yongqi.common.exception.ServiceException;
 import com.yongqi.common.utils.StringUtils;
 import com.yongqi.common.utils.StringUtils;
 import com.yongqi.common.utils.redis.CodeUtils;
 import com.yongqi.common.utils.redis.CodeUtils;
 import com.yongqi.xinrenli.domain.*;
 import com.yongqi.xinrenli.domain.*;
@@ -38,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.rmi.ServerException;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -444,8 +446,20 @@ public class DbOrderServiceImpl implements IDbOrderService {
     public R orderPay(Long orderId, Long couponId, Long discountId, LoginUser loginUser, String ipAddr) {
     public R orderPay(Long orderId, Long couponId, Long discountId, LoginUser loginUser, String ipAddr) {
         // 1.根据订单id获取订单信息
         // 1.根据订单id获取订单信息
         DbOrder dbOrder = this.baseMapper.selectById(orderId);
         DbOrder dbOrder = this.baseMapper.selectById(orderId);
+        if (ObjectUtils.isEmpty(dbOrder)) {
+            throw new ServiceException("订单不存在");
+        }
         //支付金额
         //支付金额
         BigDecimal payAmount = dbOrder.getActualAmount();
         BigDecimal payAmount = dbOrder.getActualAmount();
+        if (payAmount.compareTo(BigDecimal.ZERO) == 0) {
+            dbOrder.setPayAmount(payAmount);
+            dbOrder.setStatus(OrderStatusEnum.RECEIVED_ORDER.getCode());
+            String orderNo = CodeUtils.createSerialNumber("XQ");
+            dbOrder.setOrderNo(orderNo);
+            dbOrder.setPayTime(new Date());
+            baseMapper.updateById(dbOrder);
+            return R.ok();
+        }
         // 2.根据卡券id获取卡券信息
         // 2.根据卡券id获取卡券信息
         if (ObjectUtils.isNotEmpty(couponId)) {
         if (ObjectUtils.isNotEmpty(couponId)) {
             DbCoupon dbCoupon = couponMapper.selectById(couponId);
             DbCoupon dbCoupon = couponMapper.selectById(couponId);

yongqi-xinrenli/src/main/resources/mapper/DbOrderMapper.xml

@@ -75,6 +75,9 @@
         <if test="actualAmount != null and actualAmount != ''">
         <if test="actualAmount != null and actualAmount != ''">
             actual_amount=#{actualAmount},
             actual_amount=#{actualAmount},
         </if>
         </if>
+        <if test="adminRemark != null and adminRemark != ''">
+            admin_remark=#{adminRemark},
+        </if>
         <if test="reasonsForRejection != null and reasonsForRejection != ''">
         <if test="reasonsForRejection != null and reasonsForRejection != ''">
             reasons_for_rejection=#{reasonsForRejection},
             reasons_for_rejection=#{reasonsForRejection},
         </if>
         </if>