充值模块

cloud-market-server/src/main/java/com/muyu/cloud/market/controller/AliPayController.java

@@ -12,6 +12,7 @@ import com.muyu.cloud.market.config.AliPayConfig;
 
 import com.muyu.cloud.market.domin.Orders;
 import com.muyu.cloud.market.service.OrderShowService;
+import com.muyu.common.core.domain.Result;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.log4j.Log4j2;
@@ -101,14 +102,24 @@ public class AliPayController {
                 System.out.println("买家在支付宝唯一id: " + params.get("buyer_id"));
                 System.out.println("买家付款时间: " + params.get("gmt_payment"));
                 System.out.println("买家付款金额: " + params.get("buyer_pay_amount"));
+
                 // 更新订单为已支付
                 Orders order = new Orders();
-                order.setOrdersId(Long.valueOf(tradeNo));
+                order.setOrdersId(order.getOrdersId());
-                order.setOrdersState(2);
+                order.setProductId(order.getOrdersId());
                 orderShowService.updateByordersState1ANDproductSales(Math.toIntExact(order.getOrdersId())
-                        ,order.getOrdersProduct());}
+                        ,order.getOrdersProduct());
+            }
+
         }
         return "success";
     }
+
+
+
+
+
+
 }
 
+

cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersController.java

@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;
 
+import static java.awt.SystemColor.info;
+
 @Log4j2
 @RestController
 @RequestMapping("/orders")
@@ -46,6 +48,20 @@ public class OrdersController {
         return Result.success(info);
     }
 
+    /**
+     * 查询回收站列表
+     * (精确查ordersNum 精确查ordersState 日期范围 startdate enddate)
+     * @param req
+     * @return
+     */
+    @PostMapping("/listreclaim")
+    @Operation(summary = "查看回收站订单", description = "根据订单名称 编号 状态 查询")
+    public Result<PageInfo<Orders>> selectReclaimList(@Validated @RequestBody OrdersListReq req){
+        PageInfo<Orders> inforeclaim = orderShowService.selectReclaimList(req);
+        log.info("查看订单列表,根据订单名称 编号 状态 查询",req,info);
+        return Result.success(inforeclaim);
+    }
+
 
     /**
      * 新增订单

cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java

@@ -22,6 +22,15 @@ public interface OrderShowMapper  {
      */
     List<Orders> selectList(OrdersListReq req);
 
+    /**
+     * 查询回收站列表
+     * (精确查ordersNum 精确查ordersState 日期范围 startdate enddate)
+     * @param req
+     * @return
+     */
+    List<Orders> selectReclaimList(OrdersListReq req);
+
+
     /** 订单
      * 新增订单
      * @param ordersAddReq

cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java

@@ -21,6 +21,14 @@ public interface OrderShowService  {
      */
     PageInfo<Orders> selectList(OrdersListReq req);
 
+    /**
+     * 查询回收站列表
+     * (精确查ordersNum 精确查ordersState 日期范围 startdate enddate)
+     * @param req
+     * @return
+     */
+    PageInfo<Orders> selectReclaimList(OrdersListReq req);
+
     /**
      * 新增订单
      * @param ordersAddReq

cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java

@@ -44,7 +44,20 @@ public class OrderShowServiceImpl implements OrderShowService {
 //        return ordersList;
     }
 
-
+    /**
+     * 查询回收站列表
+     * (精确查ordersNum 精确查ordersState 日期范围 startdate enddate)
+     * @param req
+     * @return
+     */
+    @Override
+    public PageInfo<Orders> selectReclaimList(OrdersListReq req) {
+        PageHelper.startPage(req.getPageNum(),req.getPageSize());
+        List<Orders> ordersList = orderShowMapper.selectList(req);
+        PageInfo<Orders> info = new PageInfo<>(ordersList);
+        return info;
+//        return ordersList;
+    }
     /**
      * 新增订单
      * @param ordersAddReq
@@ -145,19 +158,21 @@ public class OrderShowServiceImpl implements OrderShowService {
         return orderShowMapper.getSeleOut(ids);
     }
 
+    @Override
     public Result updateByordersState1ANDproductSales(Integer ordersId, Integer productId) {
 
         Integer updateByordersState1 = orderShowMapper.updateByordersState1(ordersId);
-
+        if(updateByordersState1 < 1){
-        if(updateByordersState1 > 0){
+            return Result.error(402,"修改已支付状态失败");
-            Integer updateByproductSales = orderShowMapper.updateByproductSales(productId);
-            if(updateByproductSales > 0){
-                log.info("订单信息+产品信息",ordersId,productId);
-                Result.success(200,"修改成功");
-            }
         }
-        return Result.error(402,"修改失败");
 
+        Integer updateByproductSales = orderShowMapper.updateByproductSales(productId);
+        if(updateByproductSales < 1){
+            return Result.error(402,"修改销量增加失败");
+        }
+
+        log.info("订单信息+产品信息",ordersId,productId);
+        return Result.success(200,"修改成功");
     }
 
 

cloud-market-server/src/main/resources/bootstrap.yml

@@ -56,5 +56,6 @@ alipay:
           appId: 9021000140633904
           appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCBCZ4+TPuI+00ZLNdo2wuI8/glDJ+ksfJmWUzmOoSxd9FPPd86XwYWmyzktYh8Vw4c6DipHm3BjCVBiGIKYfk8TfsPMaz2ni3B2MxOgswnPCS+Erp5DlBz7/DMbiPOUfi15KGjB2Y3KF005NnWr9RrF4xR0bEyPdEOQhusfc7qtIintsgTTU0jDhSNLbIA4KuzXwaivAr8eBdy6uE2XO0Mq105UwtD4x7+QE8h/0QlPkS9VgMtyYMrxRBJLS85UatfjLiKcbdIT/wlOmGSoO2AlOzBjCgGZ55mEFbHnCNf0Pmn0Eaf9PLLoc5W4G5OZ7HvjBDzfV0lzzu98J83oA8DAgMBAAECggEAKCL2vsgxQUVxkNAa3Lmtl9bTK6sGiTL0hBNo0QAIwC7Vw0Eqizx9Z1CzIRy6LHrjn+g3n5sgZqCSAhVK8ZHR9YkH+4znEPrYnsAxpIYYvGd/wkOPDxJ9weIzU1M6/fUPWHyaLlyh1axPeaFphNbCSuFTOyvvYwJJYZb8hqXHU8eI0Wo15iMj9K4kcyQiUAQG16WvyXw1cX8Vt5v1r/7k1SdK8tUawzc47irlVihf3HESOX9IbcqL2CGF/3laXojSRvmgNe6Biw9MDJK7qOwrscwyNihZwcDgY6vxGZD5q9DUu6weILCLoNyceDXosOgQwKjVbOzWLj+4opSLgtluIQKBgQDtTJ7cnaK72INLdiNVbx2JtNMD1e1w/NJQvPQg12OC+hBd11U4lsU5GCmnOXshrHCgm4V761O2OMCIxsEFBPGKj1f33i4D3fGbqDwOmXPuYNLTUcIBpxm8h3RfUF3OkkAceYi9kDL5TkqgxO9zRVd9GsK27cPMo3k8zzmyCaomkQKBgQCLNODZDrNepV/vY50GFCzpqX7rdvJBXb1rtHk3JcOd8AsncSlEXLGk4TsLGvDwasBfCsBRC3FY08Ft0LgEyEv5e8DGWtPmu+Ya6ssCFwdjsOH8Ei+YtsB/672zdNtBl2vCkELECZu31659y2DGga0DVHvqmJPp3CqVWfjrQM+uUwKBgQCclkjmL6co6ZCKBST/xVjqe8Ya69nJCywFVwqJeVgTH8wZAHUd6G+wYz9pN8cGy3FuqfGFeh49SmnSV8Ua+M4irsBPse8PYi+ClZs7zwrvLDkydOreiFO1UnT6SF/+ZgekQpZ28GaSmJUqTYnsuL8osLX4XCEuMllYRS4/S51Z4QKBgGtQwYIz9g2h2fp3xca46QLdew3VLd88f9m3ULc18r8gHckzUMf12bEtPVJLW7FL6q+aXzZbZu8+l+CrxiFRtFhJkgyYWsGG21am6QfcbwLoit7DulO1l2NGfoEJNjoznIxqoD321kf9CvTJQ/rkX1ew2rK5G1ZvN5jZuq7J0REnAoGALww4e5u21/ZnayUp/dZcMiQ3+AcWVb/7I4r1lwKTUVkbKa91HsITpc7lk2U5xA2kGbBqLvS+Ok0tgiSKucRf3LDRRZx3uORBKb85GamsTIb//9+qaRWQH/oll6O/ziYrSw1QrhX/DoJpLgWyPZI+aAasFEB6JQs9Smkh1hDYGs0=
           alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7rRdHzrcyEdSOLPm3ITg+t/C3tGp9+wl739nOgFExrSD1j1C95tTRGUCqNUQtatiYmlAfwOKzkNhr/XEH/Vvpq5Ei8C4ZBWJqOMw7fQfBE6m5erO/FOuS4pyZCtQZyP9C5nhtYOupnGtq0fmgQaGKk657vszYSMEtpuQaZ5/odUYxRbYP3IHbcK+++PQBarfOdnhNcnR/Ry7TVOC3+da0dogmClPEconZQMwCJ81CJ7Hj4TKKyLTe9bz+J2tkUeNr9Mc72g4ljjftX7k0RBpBpi4HSHJ3SmPLhktiuDOeOGOef88pBgBtFV03/+aFpUEHx/imiHhBMBeNT3kqFV03QIDAQAB
-          notifyUrl: http://localhost:9701/alipay/notify
+          notifyUrl: http://21.12.0.10/alipay/notify
           returnUrl: http://localhost:9701/market/apitest/index
+#          localhost:9701

cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml

@@ -164,5 +164,23 @@
                 )
         </select>
 
+    <select id="selectReclaimList" resultType="com.muyu.cloud.market.domin.Orders">
+        SELECT orders_id, orders_num, orders_product, orders_user, orders_price, orders_specification, orders_state, orders_launchdate,
+        product_id,product_name,
+        user_id,user_name
+        FROM `orders`
+        LEFT JOIN  `product` ON `orders`.orders_product = `product`.product_id
+        LEFT JOIN `sys_user` ON `orders`.orders_user = `sys_user`.user_id
+        <where>
+            <if test="productName != null and productName != ''">AND instr( product_name , #{productName})</if>
+            <if test=" ordersNum != null and ordersNum !='' "> AND orders_num = #{ordersNum} </if>
+            <if test=" ordersState != null "> AND orders_state = #{ordersState} </if>
+            <if test="startDate!=null and startDate!=''"> AND orders_launchdate &gt;=#{startDate} </if>
+            <if test="endDate!=null and endDate!=''"> AND orders_launchdate &lt;=#{endDate} </if>
+            AND `orders`.exist = 1
+        </where>
+            ORDER BY orders_launchdate DESC
+    </select>
+
 
 </mapper>