修改水洗逻辑

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/entity/HotelLeaseLog.java

@@ -106,4 +106,11 @@ public class HotelLeaseLog implements Serializable {
 	@TableField(exist = false)
 	private String isWash;
 	private String orderDetailId;
+	/**水洗数量*/
+	private Integer washNum;
+	/**水洗单价*/
+	@TableField(exist = false)
+	private BigDecimal washUnitPrice;
+	private String pid;
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/mapper/xml/HotelLeaseLogMapper.xml

@@ -5,8 +5,9 @@
 
     <select id="myLeaseLogPage" resultType="org.jeecg.modules.hotelleaselog.entity.HotelLeaseLog">
         SELECT a.*,
-               (IFNULL(IFNULL(DATEDIFF(NOW(), a.start_time),0)*(SELECT price FROM hotel_goods_sku WHERE id = a.sku_id ),0)) zujin,
+               (IFNULL(IFNULL(DATEDIFF(NOW(), a.start_time),0)*(SELECT price FROM hotel_goods_sku WHERE id = a.sku_id )*a.num,0)) zujin,
                (a.num*(SELECT price FROM hotel_category WHERE id = a.category_id)) wash_price,
+               (SELECT price FROM hotel_category WHERE id = a.category_id) wash_unit_price,
                (select id from hotel_order where lease_id = a.id and status in (4,5,6,16)) is_wash
         FROM hotel_lease_log a WHERE a.del_flag = 0 AND a.user_id = #{userId}
         <if test="leaseFlag != null">
@@ -18,4 +19,4 @@
         ORDER BY a.create_time;
     </select>
 
-</mapper>
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/controller/OrderController.java

@@ -50,7 +50,7 @@ public class OrderController {
     @ApiOperation(value = "下订单")
     @PostMapping("/create")
     public Result<?> createOrder(HttpServletRequest request, @RequestParam String req){
-        return orderService.createOrder2(req,TokenUtils.getTokenByRequest(request));
+        return orderService.createOrder4(req,TokenUtils.getTokenByRequest(request));
     }
 
     @ApiOperation(value = "订单支付")
@@ -63,7 +63,7 @@ public class OrderController {
 
     @PostMapping("/notify")
     public Object orderNotify(@RequestBody String requestBody){
-        return orderService.orderNotify2(requestBody);
+        return orderService.orderNotify4(requestBody);
     }
 
 
@@ -71,7 +71,7 @@ public class OrderController {
     @PostMapping("/confirm")
     public Result<?> confirmOrder(HttpServletRequest request,ConfirmOrderReq confirmOrderReq){
         confirmOrderReq.setToken(TokenUtils.getTokenByRequest(request));
-        return orderService.confirmOrder(confirmOrderReq);
+        return orderService.confirmOrder3(confirmOrderReq);
     }
 
     @ApiOperation(value = "上传自己的桌布")
@@ -120,7 +120,7 @@ public class OrderController {
     @PostMapping("/cancel")
     public Result<?> cancelOrder(HttpServletRequest request,CancelOrderReq cancelOrderReq){
         cancelOrderReq.setToken(TokenUtils.getTokenByRequest(request));
-        return orderService.cancelOrder(cancelOrderReq);
+        return orderService.cancelOrder2(cancelOrderReq);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/IOrderService.java

@@ -42,6 +42,10 @@ public interface IOrderService {
 
     Result<?> createOrder2(String req, String token);
 
+    Result<?> createOrder3(String req, String token);
+
+    Result<?> createOrder4(String req, String token);
+
     /**
      * 支付
      * @param orderPayReq
@@ -70,6 +74,20 @@ public interface IOrderService {
      */
     Object orderNotify2(String requestBody);
 
+    /**
+     * 支付回调
+     * @param requestBody
+     * @return
+     */
+    Object orderNotify3(String requestBody);
+
+    /**
+     * 支付回调
+     * @param requestBody
+     * @return
+     */
+    Object orderNotify4(String requestBody);
+
     /**
      * 申请退货/换货
      * @param applyRefundOrderReq
@@ -87,6 +105,10 @@ public interface IOrderService {
      */
     Result<?> confirmOrder(ConfirmOrderReq confirmOrderReq);
 
+    Result<?> confirmOrder2(ConfirmOrderReq confirmOrderReq);
+
+    Result<?> confirmOrder3(ConfirmOrderReq confirmOrderReq);
+
     /**
      * 上传桌布
      * @param uploadTableclothReq
@@ -108,6 +130,8 @@ public interface IOrderService {
      */
     Result<?> cancelOrder(CancelOrderReq cancelOrderReq);
 
+    Result<?> cancelOrder2(CancelOrderReq cancelOrderReq);
+
 
     /**
      * 换货订单支付接口