充值模块

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

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="AliAccessStaticViaInstance" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Orders.java

@@ -2,6 +2,7 @@ package com.muyu.cloud.market.domin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -29,6 +30,7 @@ public class Orders extends BaseEntity {
     /**
      * 订单编号
      */
+    @Excel(name = "订单编号")
     private String ordersNum;
 
     /**
@@ -44,21 +46,25 @@ public class Orders extends BaseEntity {
     /**
      * 订单金额
      */
+    @Excel ( name ="订单金额")
     private BigDecimal ordersPrice;
 
     /**
      * 订单规格
      */
+    @Excel(name = "订单规格")
     private String  ordersSpecification;
 
     /**
      * 订单款项状态（1已付款，2未付款，0待支付 3.售后(申请退款) 4.已退款）
      */
+    @Excel(name = "订单款项状态")
     private Integer ordersState;
 
     /**
      * 订单日期
      */
+    @Excel(name = "订单日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
     private Date ordersLaunchdate;
@@ -66,6 +72,7 @@ public class Orders extends BaseEntity {
     /**
      * 逻辑删除字段
      */
+    @Excel(name = "逻辑删除字段")
      private Integer exist;
 
     /**
@@ -76,6 +83,7 @@ public class Orders extends BaseEntity {
     /**
      * 产品名称
      */
+    @Excel(name = "产品名称")
     private String productName;
 
     //用户模块(要使用外键)
@@ -87,6 +95,7 @@ public class Orders extends BaseEntity {
     /**
      * 用户账号
      */
+    @Excel(name = "用户账号")
     private String userName;
 
 

cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/UserCompanyResp.java

@@ -0,0 +1,99 @@
+package com.muyu.cloud.market.domin.resp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author：weiran
+ * @Package：com.muyu.cloud.market.domin
+ * @Project：cloud-market
+ * @name：UserCompany
+ * @Date：2024/9/3 16:40
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserCompanyResp {
+    /**
+     * 用户Id
+     */
+    private long userId;
+    /**
+     * 用户呢称
+     */
+    private String nickName;
+    /**
+     * 绑定邮箱
+     */
+    private String email;
+    /**
+     * 个人账户余额
+     */
+    private BigDecimal userMoney;
+
+    /**
+     * 企业ID
+     */
+    private Integer companyId;
+    /**
+     *企业名称
+     */
+    private String companyName;
+    /**
+     *企业头像
+     */
+    private String companyPhoto;
+    /**
+     * 企业法人
+     */
+    private String companyLeader;
+    /**
+     *注册人姓名
+     */
+    private String registrantName;
+    /**
+     *注册人联系方式
+     */
+    private String registrantPhone;
+    /**
+     *注册人职位
+     */
+    private String registrantPosition;
+    /**
+     *注册日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "注册日期",defaultValue = "2024-8-9",type = "String",format = "date")
+    private Date registrantDate;
+    /**
+     *社会统一信用代码
+     */
+    private String usci;
+    /**
+     *企业营业执照
+     */
+    private String businessLicense;
+    /**
+     *企业地址
+     */
+    private String companyAddress;
+    /**
+     *审核状态
+     */
+    private Integer reviewStatus;
+    /**
+     * 公司注册账户余额
+     */
+    private BigDecimal companyMoney;
+}

cloud-market-server/src/main/java/com/muyu/cloud/market/config/AliPayConfig.java

@@ -22,7 +22,6 @@ public class AliPayConfig {
     private String charset;
     private String signType;
 
-
     @PostConstruct
     public void init() {
         // 设置参数（全局只需设置一次）

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

@@ -12,8 +12,10 @@ 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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +30,7 @@ import java.util.UUID;
 @RestController
 @RequestMapping("/alipay")
 @Transactional(rollbackFor = Exception.class)
+@Log4j2
 public class AliPayController {
 
     @Resource
@@ -46,6 +49,7 @@ public class AliPayController {
     public void pay(Orders orders, HttpServletResponse httpResponse) throws Exception {
         //编号
         orders.setOrdersNum(UUID.randomUUID().toString().replace("-",""));
+
         AlipayClient alipayClient = new DefaultAlipayClient(GATEWAY_URL, aliPayConfig.getAppId(),
                 aliPayConfig.getAppPrivateKey(), FORMAT, CHARSET, aliPayConfig.getAlipayPublicKey(), SIGN_TYPE);
         AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
@@ -61,6 +65,7 @@ public class AliPayController {
             form = alipayClient.pageExecute(request).getBody();
         } catch (AlipayApiException e) {
             e.printStackTrace();
+            log.error(e);
         }
         httpResponse.setContentType("text/html;charset=" + CHARSET);
         // 直接将完整的表单html输出到页面
@@ -97,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/CompanyController.java

@@ -76,6 +76,17 @@ public class CompanyController {
     }
 
 
+    /**
+     * 绑定的企业信息
+     * @return
+     */
+    @PostMapping("/selectcompany")
+    @Operation(summary = "绑定的企业信息",description = "查看绑定的企业信息")
+    public Result selectcompany(HttpServletRequest request){
+        return Result.success(companyService.selectcompany(request));
+    }
+
+
 
 
 

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/CompanyMapper.java

@@ -2,8 +2,9 @@ package com.muyu.cloud.market.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.cloud.market.domin.Company;
-import com.muyu.cloud.market.domin.Product;
+import com.muyu.cloud.market.domin.resp.UserCompanyResp;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Author：weiran
@@ -15,4 +16,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CompanyMapper extends BaseMapper<Company> {
 
+    /**
+     * 绑定的企业信息
+     * @return
+     */
+    UserCompanyResp selectcompany(@Param("userId") Long userId);
 }

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/CompanyService.java

@@ -5,6 +5,7 @@ import com.muyu.cloud.market.domin.Company;
 import com.muyu.cloud.market.domin.Product;
 import com.muyu.cloud.market.domin.User;
 import com.muyu.cloud.market.domin.req.CompanyListReq;
+import com.muyu.cloud.market.domin.resp.UserCompanyResp;
 import jakarta.servlet.http.HttpServletRequest;
 
 /**
@@ -30,9 +31,10 @@ public interface CompanyService extends IService<Company> {
     User ifcompanyauthentication();
 
     /**
-     * 测试次数-1
+     * 绑定的企业信息
-     * @param product
      * @return
      */
+    UserCompanyResp selectcompany(HttpServletRequest request);
+
 
 }

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/UserService.java

@@ -29,4 +29,6 @@ public interface UserService extends IService<User> {
     String sendcode(String email);
 
     void updcompanyId(Long userid, Integer companyId);
+
+
 }

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

@@ -1,11 +1,10 @@
 package com.muyu.cloud.market.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.cloud.market.domin.Company;
-import com.muyu.cloud.market.domin.Product;
 import com.muyu.cloud.market.domin.User;
 import com.muyu.cloud.market.domin.req.CompanyListReq;
+import com.muyu.cloud.market.domin.resp.UserCompanyResp;
 import com.muyu.cloud.market.mapper.CompanyMapper;
 import com.muyu.cloud.market.service.CompanyService;
 import com.muyu.cloud.market.service.UserService;
@@ -93,4 +92,18 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return user;
     }
 
+    /**
+     * 绑定的企业信息
+     * @return
+     */
+    @Override
+    public UserCompanyResp selectcompany(HttpServletRequest request) {
+        //获取当前登录人信息
+        String token = SecurityUtils.getToken();// 获取当前Token
+        LoginUser loginUser = tokenService.getLoginUser(token); // 获取当前登录用户
+        Long userId = loginUser.getUserid();
+        UserCompanyResp companyResp = companyMapper.selectcompany(userId);
+        return companyResp;
+    }
+
 }

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

@@ -52,11 +52,10 @@ spring:
           # rabbit 配置文件
           - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 
-        alipay:
+alipay:
           appId: 9021000140633904
-          appPrivateKey:
+          appPrivateKey: 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
-            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
+          alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7rRdHzrcyEdSOLPm3ITg+t/C3tGp9+wl739nOgFExrSD1j1C95tTRGUCqNUQtatiYmlAfwOKzkNhr/XEH/Vvpq5Ei8C4ZBWJqOMw7fQfBE6m5erO/FOuS4pyZCtQZyP9C5nhtYOupnGtq0fmgQaGKk657vszYSMEtpuQaZ5/odUYxRbYP3IHbcK+++PQBarfOdnhNcnR/Ry7TVOC3+da0dogmClPEconZQMwCJ81CJ7Hj4TKKyLTe9bz+J2tkUeNr9Mc72g4ljjftX7k0RBpBpi4HSHJ3SmPLhktiuDOeOGOef88pBgBtFV03/+aFpUEHx/imiHhBMBeNT3kqFV03QIDAQAB
-          alipayPublicKey:
+          notifyUrl: http://21.12.0.10/alipay/notify
-            MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7rRdHzrcyEdSOLPm3ITg+t/C3tGp9+wl739nOgFExrSD1j1C95tTRGUCqNUQtatiYmlAfwOKzkNhr/XEH/Vvpq5Ei8C4ZBWJqOMw7fQfBE6m5erO/FOuS4pyZCtQZyP9C5nhtYOupnGtq0fmgQaGKk657vszYSMEtpuQaZ5/odUYxRbYP3IHbcK+++PQBarfOdnhNcnR/Ry7TVOC3+da0dogmClPEconZQMwCJ81CJ7Hj4TKKyLTe9bz+J2tkUeNr9Mc72g4ljjftX7k0RBpBpi4HSHJ3SmPLhktiuDOeOGOef88pBgBtFV03/+aFpUEHx/imiHhBMBeNT3kqFV03QIDAQAB
+          returnUrl: http://localhost:9701/market/apitest/index
-          notifyUrl: http://rnkig5.natappfree.cc/alipay/notify
+#          localhost:9701
-          returnUrl: http://localhost/market/apitest/index

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.muyu.cloud.market.mapper.CompanyMapper">
+
+    <select id="selectcompany" resultType="com.muyu.cloud.market.domin.resp.UserCompanyResp">
+        SELECT
+            sys_user.*,
+            company.*
+        FROM
+            sys_user
+                LEFT JOIN company ON sys_user.is_companyid = company.company_id
+        where user_id=#{userId}
+    </select>
+</mapper>

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>