订单审核

fs-company/src/main/java/com/fs/company/controller/store/FsStoreOrderController.java

@@ -412,6 +412,16 @@ public class FsStoreOrderController extends BaseController
         return toAjax(fsStoreOrderService.getGoods(fsStoreOrder.getOrderId(),nickName));
     }
 
+    /**
+     * 订单审核
+     */
+    @Log(title = "订单财务审核", businessType = BusinessType.INSERT)
+    @PreAuthorize("@ss.hasPermi('his:storeOrder:approveOrder')")
+    @PostMapping("/approveOrder")
+    public AjaxResult approveOrder(@RequestBody List<Long> orderIds)
+    {
+        return toAjax(fsStoreOrderService.approveOrder(orderIds));
+    }
     /**
      * 改价
      */

fs-service/src/main/java/com/fs/course/param/FsUserCourseVideoAddKfUParam.java

@@ -11,35 +11,35 @@ import java.io.Serializable;
 public class FsUserCourseVideoAddKfUParam implements Serializable {
 
     /**
-    * 企微员工 id
-    */
+     * 企微员工 id
+     */
     private String qwUserId;
 
     /**
-    * 视频小节id
-    */
+     * 视频小节id
+     */
     @NotNull(message = "视频参数不能为空")
     private Long videoId;
 
 
     /**
-    * 登录的小程序id
-    */
+     * 登录的小程序id
+     */
     private Long userId;
 
     /**
-    * 公司id
-    */
+     * 公司id
+     */
     private String corpId;
 
     /**
-    *   companyUserId
-    */
+     * companyUserId
+     */
     @NotNull(message = "客服参数不能为空")
     private Long companyUserId;
     /**
-    * 公司id
-    */
+     * 公司id
+     */
     @NotNull(message = "经销商参数参数不能为空")
     private Long companyId;
 
@@ -50,8 +50,8 @@ public class FsUserCourseVideoAddKfUParam implements Serializable {
     private Long courseId;
 
     /**
-    * 外部联系的id
-    */
+     * 外部联系的id
+     */
 //    @NotNull(message = "客户参数不能为空")
     private Long qwExternalId;
 

fs-service/src/main/java/com/fs/his/service/IFsStoreOrderService.java

@@ -284,4 +284,11 @@ public interface IFsStoreOrderService
     FsStoreOrder confirmOrder(FsPackageOrder packageOrder,Long doctorId);
 
     List<FsStoreOrder> selectOutTimeOrderList(Integer unPayTime);
+
+    /**
+     * 订单审核
+     * @param orderId
+     * @return
+     */
+    int approveOrder(List<Long> orderId);
 }

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -4599,4 +4599,20 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         return fsStoreOrderMapper.selectOutTimeOrderList(unPayTime);
     }
 
+    @Override
+    public int approveOrder(List<Long> orderId) {
+        if (CollectionUtils.isEmpty(orderId)){
+            throw new CustomException("订单id不能为空");
+        }
+        int i=0;
+        for (Long id : orderId) {
+            FsStoreOrder order=new FsStoreOrder();
+            order.setOrderId(id);
+            //手动设置为已完成
+            order.setStatus(4);
+            i = fsStoreOrderMapper.updateFsStoreOrder(order);
+        }
+        return i;
+    }
+
 }

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -917,6 +917,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maps.erpPhoneNumber != null and maps.erpPhoneNumber != ''">
                 and so.erp_phone like concat(#{maps.erpPhoneNumber},'%')
             </if>
+            <if test="maps.isPay != null">
+                and so.is_pay = #{maps.isPay}
+            </if>
 
         </where>
         ${maps.params.dataScope}