修改

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

@@ -67,13 +67,13 @@ public class PosMachineController {
                 if(sysUser.getStatus().equals("0")){
                     String password = sysUser.getPassword();
                     String webPassword = loginBody.getPassword();   //前端传来加密码
-                    System.out.println(webPassword);
-                    System.out.println(pwd);
-                    //解密
-                    byte[] bytes = CryptUtil.desedeDecrypt(Base64.getDecoder().decode(password), Base64.getDecoder().decode(pwd));
-                    //转换为字符串
-                    webPassword = Base64.getEncoder().encodeToString(bytes);
-                    System.out.println(webPassword);
+//                    System.out.println(webPassword);
+//                    System.out.println(pwd);
+//                    //解密
+//                    byte[] bytes = CryptUtil.desedeDecrypt(Base64.getDecoder().decode(password), Base64.getDecoder().decode(pwd));
+//                    //转换为字符串
+//                    webPassword = Base64.getEncoder().encodeToString(bytes);
+//                    System.out.println(webPassword);
                     BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
                     //密码加密判断已加密密码是否与真实密码相同
                     boolean matches = bCryptPasswordEncoder.matches(webPassword, password);

YijiaRestful/src/main/java/com/platform/yijia/pojo/PayOrder.java

@@ -65,6 +65,7 @@ public class PayOrder implements Serializable {
     private String classStructureDate;
     private String classStructureMan;
 
+    private String mobilePhone;     //手机号
     private String payTypeName;
 
     //分页参数

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -42,6 +42,7 @@
     <result column="customer_phone"         jdbcType="VARCHAR"   property="customerPhone" />
     <result column="customer_grade"         jdbcType="VARCHAR"   property="customerGrade" />
     <result column="oil_type"               jdbcType="VARCHAR"   property="oilType" />
+    <result column="mobile_phone"           jdbcType="VARCHAR"   property="mobilePhone" />
     <result column="payTypeName"            property="payTypeName" />
   </resultMap>
 
@@ -114,7 +115,7 @@
     T1.receivable_amt, T1.received_amt, T1.discount_amt, T1.discount_coupon_amt, T1.discount_coupon, T1.wx_amt,
     T1.zfb_amt, T1.pos_amt, T1.xj_amt, T1.didi_app_amt, T1.ty_app_amt, T1.other_amt, T1.dzk_amt, T1.score, T1.member_no, T1.member_amt,
     T1.print_count, T1.car_no, T1.customer_phone, T1.customer_grade, T1.oil_type,
-    T2.dict_label    AS payTypeName
+    T2.dict_label    AS payTypeName, T3.mobile_phone
   </sql>
   <sql id="Base_Column_List">
     order_id, order_no, oil_gun, oil_name, oil_pirce, consumer_id, consumer, amt, station_id, status,
@@ -312,6 +313,7 @@
         FROM
                     pay_order       AS T1
         LEFT JOIN   sys_dict_data   AS T2 ON T1.pay_type = T2.dict_value
+        LEFT JOIN   app_user_info   AS T3 ON T1.consumer_id = T3.user_id
         <where>
             <if test="stationId !=null">
                 T1.station_id= #{stationId}

YijiaRestful/src/test/java/com/palatform/yijia/test.java

@@ -2,6 +2,7 @@ package com.palatform.yijia;
 
 import com.platform.yijia.utils.CryptUtil;
 import lombok.SneakyThrows;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
 
 import java.io.UnsupportedEncodingException;
@@ -9,7 +10,6 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.text.Bidi;
 import java.text.SimpleDateFormat;
-import java.util.Base64;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -26,11 +26,11 @@ public class test {
             byte[] bytes2 = data.getBytes();
             byte[] bytes3 = pwd.getBytes();
             bytes = CryptUtil.desedeEncrypt(bytes2, bytes3);
-            String sss = Base64.getEncoder().encodeToString(bytes);
+            String sss = Base64.encodeBase64String(bytes);
             System.out.println(sss);
 
-            byte[] bytes1 = CryptUtil.desedeDecrypt(sss.getBytes("utf-8"), pwd.getBytes("utf-8"));
-            String ssss = Base64.getEncoder().encodeToString(bytes1);
+            byte[] bytes1 = CryptUtil.desedeDecrypt(sss.getBytes(), pwd.getBytes());
+            String ssss = Base64.encodeBase64String(bytes1);
             System.out.println(ssss);
         } catch (Exception e) {
             e.printStackTrace();