fix bug

pom.xml

@@ -9,8 +9,8 @@
         <version>2.3.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>com.caimei365</groupId>
-    <artifactId>caimei-purchase-api</artifactId>
+    <groupId>com.caimei</groupId>
+    <artifactId>caimei-open-api</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <properties>
@@ -290,7 +290,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <!-- springboot启动类目录 -->
-                    <mainClass>com.com.caimei.PurchaseApplication</mainClass>
+                    <mainClass>com.caimei.OpenApplication</mainClass>
                 </configuration>
                 <executions>
                     <execution>

src/main/java/com/caimei/PurchaseApplication.java → src/main/java/com/caimei/OpenApplication.java

@@ -18,23 +18,12 @@ import javax.servlet.MultipartConfigElement;
  * @author : Aslee
  * @date : 2021/6/4
  */
-@Import(FdfsClientConfig.class)
-// 解决jmx重复注册bean的问题
-@EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
 @SpringBootApplication
-public class PurchaseApplication {
+public class OpenApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(PurchaseApplication.class, args);
+        SpringApplication.run(OpenApplication.class, args);
     }
 
-    /**
-     * 文件上传临时路径
-     */
-    @Bean
-    MultipartConfigElement multipartConfigElement() {
-        MultipartConfigFactory factory = new MultipartConfigFactory();
-        factory.setLocation("/mnt/newdatadrive/data/runtime/jar-instance/purchase/tempImage");
-        return factory.createMultipartConfig();
-    }
+
 }

src/main/java/com/caimei/config/ApiConfig.java

@@ -12,7 +12,7 @@ import javax.annotation.Resource;
  * @author : Aslee
  * @date : 2021/6/4
  */
-@Configuration
+//@Configuration
 public class ApiConfig implements WebMvcConfigurer {
     @Resource
     private ApiInterceptor apiInterceptor;

src/main/java/com/caimei/config/ApiInterceptor.java

@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author : Aslee
  * @date : 2021/5/18
  */
-@Component
+//@Component
 public class ApiInterceptor implements HandlerInterceptor {
 
     private RedisService redisService;

src/main/java/com/caimei/config/FastDfsClient.java

@@ -14,7 +14,7 @@ import java.io.*;
  * @author Aslee
  * @date 2021/6/4
  */
-@Component
+//@Component
 public class FastDfsClient {
 
     @Autowired

src/main/java/com/caimei/config/GlobalTokenAspect.java

@@ -21,8 +21,8 @@ import javax.servlet.http.HttpServletRequest;
  * @author : Charles
  * @date : 2020/3/17
  */
-@Component
-@Aspect
+//@Component
+//@Aspect
 public class GlobalTokenAspect {
 
     @Value("${caimei.oldapi}")

src/main/java/com/caimei/service/impl/OrderServiceImpl.java

@@ -293,7 +293,7 @@ public class OrderServiceImpl implements OrderService {
             /*
              * 整理订单商品数据
              */
-            CmOrderProductPo orderProduct = setOrderProduct(productNum, organizeProduct, productPrice, priceType, 1, addedValueTax);
+            CmOrderProductPo orderProduct = setOrderProduct(productNum, organizeProduct, productPrice, priceType, 0, addedValueTax);
             // 加入订单商品列表
             orderProductList.add(orderProduct);
             // 保存供应商id

src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 spring:
   application:
     # 指定服务名
-    name: caimei-purchase-api
+    name: caimei-open-api
   profiles:
     active: @activatedProperties@
 

src/main/resources/config/beta/application-beta.yml

@@ -48,7 +48,7 @@ spring:
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/jar-instance/zplma/logs
+    path: /mnt/newdatadrive/data/runtime/jar-instance/open/logs
   level:
     root: info
 

src/main/resources/config/prod/application-prod.yml

@@ -45,7 +45,7 @@ spring:
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/jar-instance/zplma/logs
+    path: /mnt/newdatadrive/data/runtime/jar-instance/open/logs
   level:
     root: info
 

src/main/resources/mapper/OrderMapper.xml

@@ -1313,18 +1313,12 @@
             <if test="invoiceTitle != null">
                 invoiceTitle,
             </if>
-            <if test="invoiceType != null">
-                invoiceType,
-            </if>
             <if test="type != null">
                 `type`,
             </if>
             <if test="invoiceContent != null">
                 invoiceContent,
             </if>
-            <if test="invoiceTitleType != null">
-                invoiceTitleType,
-            </if>
             <if test="corporationTaxNum != null">
                 corporationTaxNum,
             </if>
@@ -1348,18 +1342,12 @@
             <if test="invoiceTitle != null">
                 #{invoiceTitle,jdbcType=VARCHAR},
             </if>
-            <if test="invoiceType != null">
-                #{invoiceType,jdbcType=VARCHAR},
-            </if>
             <if test="type != null">
                 #{type,jdbcType=CHAR},
             </if>
             <if test="invoiceContent != null">
                 #{invoiceContent,jdbcType=VARCHAR},
             </if>
-            <if test="invoiceTitleType != null">
-                #{invoiceTitleType,jdbcType=VARCHAR},
-            </if>
             <if test="corporationTaxNum != null">
                 #{corporationTaxNum,jdbcType=VARCHAR},
             </if>
@@ -1556,18 +1544,12 @@
             <if test="invoiceTitle != null">
                 invoiceTitle = #{invoiceTitle,jdbcType=VARCHAR},
             </if>
-            <if test="invoiceType != null">
-                invoiceType = #{invoiceType,jdbcType=VARCHAR},
-            </if>
             <if test="type != null">
                 type = #{type,jdbcType=CHAR},
             </if>
             <if test="invoiceContent != null">
                 invoiceContent = #{invoiceContent,jdbcType=VARCHAR},
             </if>
-            <if test="invoiceTitleType != null">
-                invoiceTitleType = #{invoiceTitleType,jdbcType=VARCHAR},
-            </if>
             <if test="corporationTaxNum != null">
                 corporationTaxNum = #{corporationTaxNum,jdbcType=VARCHAR},
             </if>

src/test/java/caimei/PurchaseApplicationTests.java → src/test/java/caimei/OpenApplicationTests.java

@@ -28,11 +28,13 @@ import java.util.LinkedHashMap;
 import java.util.UUID;
 
 @SpringBootTest
-public class PurchaseApplicationTests {
+public class OpenApplicationTests {
 
     //private String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDawyiPFWo4tSS1YX/mXTIGWghehyYfec2JeQFJONfLTOcyJ11RP+19E3QSn6JiclYbRM+Rzt/gvFOnVAyvZ6VUFkIZlMr9ykqB74crQs6pw4AY0lREscV8yk5QYEGPCv3I97A8Pm44ThWGuXQ1cjmxBk+zS4xR2Yu+jPZb65HsNwIDAQAB";
-    private String privateKey = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANrDKI8Vaji1JLVhf+ZdMgZaCF6HJh95zYl5AUk418tM5zInXVE/7X0TdBKfomJyVhtEz5HO3+C8U6dUDK9npVQWQhmUyv3KSoHvhytCzqnDgBjSVESxxXzKTlBgQY8K/cj3sDw+bjhOFYa5dDVyObEGT7NLjFHZi76M9lvrkew3AgMBAAECgYBFSyISyI6/7aj2By8zMfwBhQ03nAmYWMWhMQIWRnocPHzTJyLo9J3uS3Yt3ADcvCjINHCnV+cUUbMRwo7OFL+KH+NDeLBmv0b+oMoVeOhgJZWkpt+O4bA90+NrA4P3sPqPbJUG1fqtm+Ll8wTASrLxrwyiRn2VRCfwMRTqaTc9sQJBAPqvhe+Ler0dx82kXxr+gwOdRJLqYCqverP66obKRamOG0wF9Hj04fTgz0iwiQK/Jpvu4jfPg6fWyGvGq6lNFdkCQQDfZmMCOHowT9AS21VZYJVE+cBZjg2aP5XV1rXPnOi18cBaDwo8EIIO9gXPtk1GtMeuVf9esXNfSI8SI9GtTXiPAkEAl7UTXAVP8RUNrqCTwbVWuiA5uKNIMWzi1/q4ZXwRrmvGjzpnWa/w8o3+Q6I6OERP7DwkANx/c1ojDj478ogo+QJAfK3H1BVxHEVu+xcuKxOcO0Kn91MwhEW4ef+6uIP53JFvqNN8AsmzzGXCGIrF1hBO4R1dyJuAqEz2jEkxXGdAQQJBAKKFeQ6eiHzwWeiiuMG0Hge4gTPra4v4lHtxcFfqv3tlQ+7LVnw4+4YBMqXRoW+CbwCYhrvoaOqSYTq0xvkctGo=";
-    private String cmAccount = "AAD38EE44AC49124B18C089717ED10B0";
+//    private String privateKey = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANrDKI8Vaji1JLVhf+ZdMgZaCF6HJh95zYl5AUk418tM5zInXVE/7X0TdBKfomJyVhtEz5HO3+C8U6dUDK9npVQWQhmUyv3KSoHvhytCzqnDgBjSVESxxXzKTlBgQY8K/cj3sDw+bjhOFYa5dDVyObEGT7NLjFHZi76M9lvrkew3AgMBAAECgYBFSyISyI6/7aj2By8zMfwBhQ03nAmYWMWhMQIWRnocPHzTJyLo9J3uS3Yt3ADcvCjINHCnV+cUUbMRwo7OFL+KH+NDeLBmv0b+oMoVeOhgJZWkpt+O4bA90+NrA4P3sPqPbJUG1fqtm+Ll8wTASrLxrwyiRn2VRCfwMRTqaTc9sQJBAPqvhe+Ler0dx82kXxr+gwOdRJLqYCqverP66obKRamOG0wF9Hj04fTgz0iwiQK/Jpvu4jfPg6fWyGvGq6lNFdkCQQDfZmMCOHowT9AS21VZYJVE+cBZjg2aP5XV1rXPnOi18cBaDwo8EIIO9gXPtk1GtMeuVf9esXNfSI8SI9GtTXiPAkEAl7UTXAVP8RUNrqCTwbVWuiA5uKNIMWzi1/q4ZXwRrmvGjzpnWa/w8o3+Q6I6OERP7DwkANx/c1ojDj478ogo+QJAfK3H1BVxHEVu+xcuKxOcO0Kn91MwhEW4ef+6uIP53JFvqNN8AsmzzGXCGIrF1hBO4R1dyJuAqEz2jEkxXGdAQQJBAKKFeQ6eiHzwWeiiuMG0Hge4gTPra4v4lHtxcFfqv3tlQ+7LVnw4+4YBMqXRoW+CbwCYhrvoaOqSYTq0xvkctGo=";
+    private String privateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAICCSN7GK4wCYyT6uZttd69OHz+dZ+utyzgnDx2BOkX6bxTZ9YcTR42B7NcBpuAXQ51cZiBS7wUVl/Gb4ATu6s2xrGgCQ33JVwAJYsidbFLj7vq8YXGII6lnRFUfn+S2BUYU1Vti2FA7pzYaZ9/t1TMv83gjM/hEs9bdxazv52zTAgMBAAECgYAuKR5tzzdTOoRMgzdqqj6knOZCnpL2qF3oFLesPIAnJNcD4Wr9kyJPpUziyngb5J9oBgm1MLUk2WXT5s7oVr3GlO6B7Ei2Gl7lvYQCmBiIIRg4xa5wPn5T4cGCAPqOZ0LPLZSt7tOVUCiPo3oTQDxQoWbt9pS777GiMjiI7ZJDWQJBALXbDm4GWPRYqpyk7EB59vK1wrp7nv1yxUC8hH5hqpZIe/xy2Qhr79R/NI5YQ5A/+W2/7vQh3260Fjj8pXbntgcCQQC05zs1XI53qArMaJo2Ijzd2hmG3t/U0TTiCav0jDGv7tRsAypkwm/emAcoc81GvXEG0HEwWKguS4GoykGj1P/VAkAaySIt+IdfrjOrEOuvb4d9JmKBPzYi1KXTLDFDwDT1H8YLYAsxn1xa60Wddci11YZysOOMV/TmBGaFjEj+45A/AkBjTMIdam7xk5ZJ2ek8adLLXJrCg7iN00CaCwEOvZ3QmuKTX7F3mZtarkzPkbFOcVKHkQdwqFm4/81uX4dkbNj5AkEAiTQESAc0v/DaI89m97cD6bR3o7VMdmdhS+FDjmR0EKJYhsF7iWC2jehOz9GQH+26z7udh9XC7yHMviXYzt945A==";
+    private String cmAccount = "A1F078B2B6DE43EC34071ED42EC6D359";
+//    private String cmAccount = "AAD38EE44AC49124B18C089717ED10B0";
 
 
     @Test
@@ -40,7 +42,7 @@ public class PurchaseApplicationTests {
         JSONObject json = new JSONObject();
         json.put("pageNum", 1);
         json.put("pageSize", 10);
-        json.put("productName", "精华油");
+//        json.put("productName", "精华油");
         // 私钥签名
         String sign = KeyUtils.buildSign(json, privateKey);
         json.put("sign", sign);
@@ -48,8 +50,8 @@ public class PurchaseApplicationTests {
         String data = KeyUtils.buildDataPrivate(json, privateKey);
         System.out.println(data);
         // 发送请求
-        JSONObject result = KeyUtils.httpPost("http://localhost:8013/product/list", cmAccount, data);
-        String code = result.getString("code");
+//        JSONObject result = KeyUtils.httpPost("http://localhost:8013/product/list", cmAccount, data);
+//        String code = result.getString("code");
     }
 
     @Test
@@ -63,14 +65,15 @@ public class PurchaseApplicationTests {
         String data = KeyUtils.buildDataPrivate(json, privateKey);
         System.out.println(data);
         // 发送请求
-        JSONObject result = KeyUtils.httpPost("http://localhost:8013/product/detail", cmAccount, data);
-        String code = result.getString("code");
+//        JSONObject result = KeyUtils.httpPost("http://localhost:8013/product/detail", cmAccount, data);
+//        String code = result.getString("code");
     }
 
     @Test
     public void orderSubmit() throws Exception {
         JSONObject json = new JSONObject();
-        json.put("orderId", "cm8870");
+        json.put("orderId", "cm8872");
+        json.put("notifyUrl", "https://open-b.caimei365.com/order/pay/callBack");
         JSONObject addressInfoMap =  new JSONObject();
         addressInfoMap.put("provinceName", "广东省");
         addressInfoMap.put("cityName", "深圳市");
@@ -80,12 +83,14 @@ public class PurchaseApplicationTests {
         addressInfoMap.put("mobile", "15828899221");
         json.put("addressInfo", addressInfoMap);
         JSONObject productInfoMap =  new JSONObject();
-        productInfoMap.put("0001", 2);
-        productInfoMap.put("0002", 3);
-        productInfoMap.put("0003", 4);
+//        productInfoMap.put("0001", 2);
+//        productInfoMap.put("0002", 3);
+//        productInfoMap.put("0003", 4);
+        productInfoMap.put("0004", 4);
+        productInfoMap.put("0006", 3);
         json.put("productInfo", productInfoMap);
         JSONObject payInfoMap = new JSONObject();
-        payInfoMap.put("orderShouldPayFee", 3253.75f);
+        payInfoMap.put("orderShouldPayFee", 2360.14f);
         payInfoMap.put("freight", 0);
         payInfoMap.put("freePostFlag", -1);
         json.put("payInfo", payInfoMap);
@@ -97,9 +102,9 @@ public class PurchaseApplicationTests {
         orderInvoiceMap.put("registeredPhone", "15814011616");
         orderInvoiceMap.put("openBank", "开户银行");
         orderInvoiceMap.put("bankAccountNo", "987987465465464");
-        json.put("orderInvoice", orderInvoiceMap);
+        json.put("invoiceInfo", orderInvoiceMap);
 //        String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDawyiPFWo4tSS1YX/mXTIGWghehyYfec2JeQFJONfLTOcyJ11RP+19E3QSn6JiclYbRM+Rzt/gvFOnVAyvZ6VUFkIZlMr9ykqB74crQs6pw4AY0lREscV8yk5QYEGPCv3I97A8Pm44ThWGuXQ1cjmxBk+zS4xR2Yu+jPZb65HsNwIDAQAB";
-        String privateKey = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANrDKI8Vaji1JLVhf+ZdMgZaCF6HJh95zYl5AUk418tM5zInXVE/7X0TdBKfomJyVhtEz5HO3+C8U6dUDK9npVQWQhmUyv3KSoHvhytCzqnDgBjSVESxxXzKTlBgQY8K/cj3sDw+bjhOFYa5dDVyObEGT7NLjFHZi76M9lvrkew3AgMBAAECgYBFSyISyI6/7aj2By8zMfwBhQ03nAmYWMWhMQIWRnocPHzTJyLo9J3uS3Yt3ADcvCjINHCnV+cUUbMRwo7OFL+KH+NDeLBmv0b+oMoVeOhgJZWkpt+O4bA90+NrA4P3sPqPbJUG1fqtm+Ll8wTASrLxrwyiRn2VRCfwMRTqaTc9sQJBAPqvhe+Ler0dx82kXxr+gwOdRJLqYCqverP66obKRamOG0wF9Hj04fTgz0iwiQK/Jpvu4jfPg6fWyGvGq6lNFdkCQQDfZmMCOHowT9AS21VZYJVE+cBZjg2aP5XV1rXPnOi18cBaDwo8EIIO9gXPtk1GtMeuVf9esXNfSI8SI9GtTXiPAkEAl7UTXAVP8RUNrqCTwbVWuiA5uKNIMWzi1/q4ZXwRrmvGjzpnWa/w8o3+Q6I6OERP7DwkANx/c1ojDj478ogo+QJAfK3H1BVxHEVu+xcuKxOcO0Kn91MwhEW4ef+6uIP53JFvqNN8AsmzzGXCGIrF1hBO4R1dyJuAqEz2jEkxXGdAQQJBAKKFeQ6eiHzwWeiiuMG0Hge4gTPra4v4lHtxcFfqv3tlQ+7LVnw4+4YBMqXRoW+CbwCYhrvoaOqSYTq0xvkctGo=";
+//        String privateKey = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANrDKI8Vaji1JLVhf+ZdMgZaCF6HJh95zYl5AUk418tM5zInXVE/7X0TdBKfomJyVhtEz5HO3+C8U6dUDK9npVQWQhmUyv3KSoHvhytCzqnDgBjSVESxxXzKTlBgQY8K/cj3sDw+bjhOFYa5dDVyObEGT7NLjFHZi76M9lvrkew3AgMBAAECgYBFSyISyI6/7aj2By8zMfwBhQ03nAmYWMWhMQIWRnocPHzTJyLo9J3uS3Yt3ADcvCjINHCnV+cUUbMRwo7OFL+KH+NDeLBmv0b+oMoVeOhgJZWkpt+O4bA90+NrA4P3sPqPbJUG1fqtm+Ll8wTASrLxrwyiRn2VRCfwMRTqaTc9sQJBAPqvhe+Ler0dx82kXxr+gwOdRJLqYCqverP66obKRamOG0wF9Hj04fTgz0iwiQK/Jpvu4jfPg6fWyGvGq6lNFdkCQQDfZmMCOHowT9AS21VZYJVE+cBZjg2aP5XV1rXPnOi18cBaDwo8EIIO9gXPtk1GtMeuVf9esXNfSI8SI9GtTXiPAkEAl7UTXAVP8RUNrqCTwbVWuiA5uKNIMWzi1/q4ZXwRrmvGjzpnWa/w8o3+Q6I6OERP7DwkANx/c1ojDj478ogo+QJAfK3H1BVxHEVu+xcuKxOcO0Kn91MwhEW4ef+6uIP53JFvqNN8AsmzzGXCGIrF1hBO4R1dyJuAqEz2jEkxXGdAQQJBAKKFeQ6eiHzwWeiiuMG0Hge4gTPra4v4lHtxcFfqv3tlQ+7LVnw4+4YBMqXRoW+CbwCYhrvoaOqSYTq0xvkctGo=";
         // 私钥签名
         String sign = KeyUtils.buildSign(json, privateKey);
         json.put("sign", sign);