订单代码调整，用户注册接口添加注释

YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -15,6 +15,12 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
+/***
+ * <Title> AppUserInfoController </Title>
+ * <Description> 公众号小程序注册用户信息接口  </Description>
+ * @date  2020年12月15日
+ * @Author JK
+ */
 public class AppUserInfoController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(PayController.class);
     @Resource
@@ -32,10 +38,12 @@ public class AppUserInfoController {
         ResultData resultData=null;
         AppUserInfo appUserInfo =new AppUserInfo();
         if(request.getUserType()!=null){
+            //1-微信公众号
             if(request.getUserType().equals("1") &&StringUtils.isNotBlank(request.getBlogOpenid())&&StringUtils.isNotBlank(request.getBlogToken())){
                 appUserInfo.setUserType(request.getUserType());
                 appUserInfo.setBlogToken(request.getBlogToken());
                 appUserInfo.setBlogOpenid(request.getBlogOpenid());
+             //2-微信小程序
             }else if(request.getUserType().equals("2") &&StringUtils.isNotBlank(request.getMinaOpenid())&&StringUtils.isNotBlank(request.getMinaToken())){
                 appUserInfo.setUserType(request.getUserType());
                 appUserInfo.setMinaToken(request.getMinaToken());

YijiaRestful/src/main/java/com/platform/yijia/param/request/AppUserInfoRequest.java

@@ -1,17 +1,23 @@
 package com.platform.yijia.param.request;
 
+/***
+ * <Title> AppUserInfoRequest </Title>
+ * <Description> 公众号小程序注册用户信息实体类  </Description>
+ * @date  2020年12月15日
+ * @Author JK
+ */
 public class AppUserInfoRequest {
-    private String userType;
-    private String blogOpenid;
-    private String minaOpenid;
-    private String mobilePhone;
-    private String blogNickName;
-    private String sexFlag;
-    private String registeDate;
-    private String blogToken;
-    private String minaToken;
-    private String blogProfilePhoto;
-    private String updateDate;
+    private String userType;        //注册类型：1-微信公众号；2-微信小程序
+    private String blogOpenid;      //公众号的openid
+    private String minaOpenid;      //小程序的openid
+    private String mobilePhone;     //注册者手机号码
+    private String blogNickName;    //注册者昵称
+    private String sexFlag;         //注册者性别：M-男  W：女
+    private String registeDate;     //注册时间
+    private String blogToken;       //公众号用户token信息
+    private String minaToken;       //小程序用户token信息
+    private String blogProfilePhoto;    //用户头像
+    private String updateDate;          //更新时间
 
     public String getUserType() {
         return userType;

YijiaRestful/src/main/java/com/platform/yijia/param/request/PayOrderRequest.java

@@ -12,6 +12,24 @@ public class PayOrderRequest {
     private String payType;
     private String payWay;
     private  String userType;
+    private  String oilPersonnel;
+    private  String orderType;
+
+    public String getOilPersonnel() {
+        return oilPersonnel;
+    }
+
+    public void setOilPersonnel(String oilPersonnel) {
+        this.oilPersonnel = oilPersonnel;
+    }
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
 
     public String getUserType() {
         return userType;

YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -32,16 +32,16 @@ public class PayOrderServiceImpl implements PayOrderService {
     @Transactional
     public String AddPayOrderInfo(PayOrderRequest payOrderRequest, PayOrder payOrder) {
 
-        //payOrder.setStatus("0");          //创建订单 未支付状态 0
+        payOrder.setStatus(payOrderRequest.getStatus());          //创建订单 未支付状态 0
         payOrder.setAmt(payOrderRequest.getAmt());              //金额
         payOrder.setOilName(payOrderRequest.getOilName());      //油品名称
         payOrder.setStationId(payOrderRequest.getStationId());  //油站id
         payOrder.setPayType(payOrderRequest.getPayType());      //支付类型
         payOrder.setPayWay(payOrderRequest.getPayWay());        //支付方式
         payOrder.setPayDate(new Date());    //支付时间
-        //payOrder.setOilPersonnel();       //加油员
+        payOrder.setOilPersonnel(payOrderRequest.getOilPersonnel());       //加油员
         payOrder.setCreatedDate(new Date());    //创建时间
-        //payOrder.setOrderType("");            //订单类型
+        payOrder.setOrderType(payOrderRequest.getOrderType());            //订单类型
 
         //订单规则 时间+6位随机数
         Random random = new Random();