hmp 4 жил өмнө
parent
commit
bc5a7bf4d0

+ 13 - 0
src/main/java/org/springblade/common/enums/AppConstant.java

@@ -15,4 +15,17 @@ public interface AppConstant {
 	enum GOODS_STATUS{
 		待付款,待发货,待收货,已完成
 	}
+
+	@Getter
+	@AllArgsConstructor
+	enum LOGISTICS_PARAMS{
+		APP_ID("1709349"),
+		APP_KEY("4d07512e-6516-4413-b82a-c68228111119"),
+		REQ_URL("https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx"),
+
+		;
+
+
+		private String name;
+	}
 }

+ 179 - 0
src/main/java/org/springblade/common/utils/LogisticsQuery.java

@@ -0,0 +1,179 @@
+package org.springblade.common.utils;
+
+import cn.hutool.core.codec.Base64;
+import org.springblade.common.enums.AppConstant;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 物流查询接口
+ * @author cy-computer
+ */
+@Component
+public class LogisticsQuery {
+
+	/**
+	 * 即时查询接口
+	 * @return
+	 * @throws Exception
+	 */
+	public String orderOnlineByJson(String shipperCode,String logisticCode) throws Exception{
+        // 组装应用级参数
+        String RequestData= "{"+
+                "'CustomerName': '',"+
+                "'OrderCode': '',"+
+                "'ShipperCode': '"+shipperCode+"',"+
+                "'LogisticCode': '"+logisticCode+"',"+
+                "}";
+        // 组装系统级参数
+        Map<String,String> params = new HashMap<String,String>();
+        params.put("RequestData", urlEncoder(RequestData, "UTF-8"));
+        params.put("EBusinessID", AppConstant.LOGISTICS_PARAMS.APP_ID.getName());
+		//免费即时查询接口指令1002/在途监控即时查询接口指令8001/地图版即时查询接口指令8003
+        params.put("RequestType", "1002");
+        String dataSign=encrypt(RequestData, AppConstant.LOGISTICS_PARAMS.APP_KEY.getName(), "UTF-8");
+        params.put("DataSign", urlEncoder(dataSign, "UTF-8"));
+        params.put("DataType", "2");
+        // 以form表单形式提交post请求,post请求体中包含了应用级参数和系统级参数
+        String result=sendPost(AppConstant.LOGISTICS_PARAMS.REQ_URL.getName(), params);
+
+        //根据公司业务处理返回的信息......
+        return result;
+    }
+
+    /**
+     * MD5加密
+     * str 内容
+     * charset 编码方式
+     * @throws Exception
+     */
+    private String MD5(String str,String charset) throws Exception {
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        md.update(str.getBytes(charset));
+        byte[] result = md.digest();
+        StringBuffer sb = new StringBuffer(32);
+        for (int i = 0; i < result.length; i++) {
+            int val = result[i] & 0xff;
+            if (val <= 0xf) {
+                sb.append("0");
+            }
+            sb.append(Integer.toHexString(val));
+        }
+        return sb.toString().toLowerCase();
+    }
+
+    /**
+     * base64编码
+     * str 内容
+     * charset 编码方式
+     * @throws UnsupportedEncodingException
+     */
+    private String base64(String str, String charset) throws UnsupportedEncodingException{
+        String encoded = Base64.encode(str.getBytes(charset));
+        return encoded;
+    }
+
+    @SuppressWarnings("unused")
+    private String urlEncoder(String str, String charset) throws UnsupportedEncodingException{
+        String result = URLEncoder.encode(str, charset);
+        return result;
+    }
+
+    /**
+     * 电商Sign签名生成
+     * content 内容
+     * keyValue ApiKey
+     * charset 编码方式
+     * @throws UnsupportedEncodingException ,Exception
+     * @return DataSign签名
+     */
+    @SuppressWarnings("unused")
+    private  String encrypt (String content,String keyValue,String charset) throws UnsupportedEncodingException, Exception
+    {
+        if (keyValue != null)
+        {
+            return base64(MD5(content + keyValue, charset), charset);
+        }
+        return base64(MD5(content, charset), charset);
+    }
+
+    /**
+     * 向指定 URL 发送POST方法的请求
+     * url 发送请求的 URL
+     * params 请求的参数集合
+     * @return 远程资源的响应结果
+     */
+    @SuppressWarnings("unused")
+    private  String sendPost(String url, Map<String,String> params) {
+        OutputStreamWriter out = null;
+        BufferedReader in = null;
+        StringBuilder result = new    StringBuilder();
+        try {
+            URL realUrl = new URL(url);
+            HttpURLConnection conn =(HttpURLConnection) realUrl.openConnection();
+            // 发送POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            // POST方法
+            conn.setRequestMethod("POST");
+            // 设置通用的请求属性
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent",
+                    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            conn.connect();
+            // 获取URLConnection对象对应的输出流
+            out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+            // 发送请求参数
+            if (params != null) {
+                StringBuilder param = new    StringBuilder();
+                for (Map.Entry<   String,    String> entry : params.entrySet()) {
+                    if(param.length()>0){
+                        param.append("&");
+                    }
+                    param.append(entry.getKey());
+                    param.append("=");
+                    param.append(entry.getValue());
+                    System.out.println(entry.getKey()+":"+entry.getValue());
+                }
+                System.out.println("param:"+param.toString());
+                out.write(param.toString());
+            }
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(
+                    new InputStreamReader(conn.getInputStream(), "UTF-8"));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //使用finally块来关闭输出流、输入流
+        finally{
+            try{
+                if(out!=null){
+                    out.close();
+                }
+                if(in!=null){
+                    in.close();
+                }
+            }
+            catch(IOException ex){
+                ex.printStackTrace();
+            }
+        }
+        return result.toString();
+    }
+}
+

+ 9 - 6
src/main/java/org/springblade/gateway/login_gateway/controller/LoginController.java

@@ -1,6 +1,7 @@
 package org.springblade.gateway.login_gateway.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -64,12 +65,14 @@ public class LoginController {
 	 */
 	@PostMapping("/savePhone")
 	public R<Boolean> savePhone(@RequestParam String phone,@RequestParam Long userId){
-		List<LoginUser> list = loginUserService.list(Condition.getQueryWrapper(new LoginUser()).lambda().eq(LoginUser::getPhone, phone));
-		Assert.isTrue(CollUtil.isEmpty(list), "该手机号已被绑定");
-		LoginUser loginUser = loginUserService.getById(userId);
-		Assert.notNull(loginUser, "找不到该用户");
-		loginUser.setPhone(phone);
-		return R.status(loginUserService.updateById(loginUser));
+		synchronized (phone.intern()){
+			List<LoginUser> list = loginUserService.list(Condition.getQueryWrapper(new LoginUser()).lambda().eq(LoginUser::getPhone, phone));
+			Assert.isTrue(CollUtil.isEmpty(list), "该手机号已被绑定");
+			LoginUser loginUser = loginUserService.getById(userId);
+			Assert.notNull(loginUser, "找不到该用户");
+			loginUser.setPhone(phone);
+			return R.status(loginUserService.updateById(loginUser));
+		}
 	}
 
 	/**

+ 24 - 2
src/main/java/org/springblade/gateway/point_gateway/controller/PointExchangeController.java

@@ -1,9 +1,12 @@
 package org.springblade.gateway.point_gateway.controller;
 
+import cn.hutool.json.JSONUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.common.utils.LogisticsQuery;
 import org.springblade.core.tool.api.R;
 import org.springblade.gateway.point_gateway.service.PointExchangeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,15 +15,27 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author cy-computer
+ */
 @RestController
 @RequestMapping("app/point")
 @Api(value = "积分兑换", tags = "积分兑换接口")
+@AllArgsConstructor
 public class PointExchangeController {
 
-	@Autowired
 	private PointExchangeService pointExchangeService;
+	private LogisticsQuery logisticsQuery;
 
-	//积分兑换商品
+	/**
+	 * 积分兑换商品
+	 * @param type
+	 * @param phone
+	 * @param num
+	 * @param goodsId
+	 * @param addressId
+	 * @return
+	 */
 	@PostMapping("/exchange")
 	@ApiOperation("积分兑换")
 	public R<Boolean> exchange(@ApiParam(value = "兑换类型",required = true) @RequestParam Integer type,
@@ -29,6 +44,13 @@ public class PointExchangeController {
 							   @ApiParam(value = "商品ID",required = true) @RequestParam Long goodsId,
 						   @ApiParam(value = "收获地址ID",required = false) @RequestParam Long addressId){
 		return R.status(pointExchangeService.exchange(type,phone,goodsId,addressId,num));
+	}
+
 
+	@PostMapping("/queryLogistics")
+	@ApiOperation("插叙物流接口")
+	public R queryLogistics(@RequestParam String shipperCode,@RequestParam String logisticCode) throws Exception {
+		String jsonStr = logisticsQuery.orderOnlineByJson(shipperCode, logisticCode);
+		return R.data(JSONUtil.parseObj(jsonStr));
 	}
 }

+ 1 - 0
src/main/java/org/springblade/sing/active/controller/ActiveProductRecordController.java

@@ -90,6 +90,7 @@ public class ActiveProductRecordController extends BladeController {
 			return R.data(null);
 	}
 
+
 	/**
 	 * 分页 活动作品搜索
 	 */

+ 1 - 3
src/main/java/org/springblade/sing/active/controller/ActiveRecordController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.sing.active.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -60,7 +61,6 @@ public class ActiveRecordController extends BladeController {
 		ActiveRecord detail = activeRecordService.getOne(Condition.getQueryWrapper(activeRecord));
 		return R.data(ActiveRecordWrapper.build().entityVO(detail));
 	}
-
 	/**
 	 * 分页 活动记录
 	 */
@@ -71,8 +71,6 @@ public class ActiveRecordController extends BladeController {
 		IPage<ActiveRecord> pages = activeRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(activeRecord));
 		return R.data(ActiveRecordWrapper.build().pageVO(pages));
 	}
-
-
 	/**
 	 * 自定义分页 活动记录
 	 */

+ 20 - 0
src/main/java/org/springblade/sing/user/controller/LoginUserController.java

@@ -16,6 +16,9 @@
  */
 package org.springblade.sing.user.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,6 +39,9 @@ import org.springblade.sing.user.wrapper.LoginUserWrapper;
 import org.springblade.sing.user.service.ILoginUserService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  * 用户表 控制器
  *
@@ -114,6 +120,20 @@ public class LoginUserController extends BladeController {
 		return R.status(loginUserService.saveOrUpdate(loginUser));
 	}
 
+	/**
+	 * 更新用户信息
+	 */
+	@PostMapping("/updateInfo")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入loginUser")
+	public R updateInfo(@Valid @RequestBody LoginUser loginUser) {
+		Assert.notNull(loginUser.getId(), "用户id不能为空");
+		if (ObjectUtil.isNotEmpty(loginUser.getPhone())) {
+			LoginUser user = loginUserService.getOne(Condition.getQueryWrapper(new LoginUser()).lambda().eq(LoginUser::getPhone, loginUser.getPhone()));
+			Assert.isFalse(user != null && ObjectUtil.notEqual(loginUser.getId(), user.getId()), "该手机号已被绑定");
+		}
+		return R.status(loginUserService.updateById(loginUser));
+	}
 
 	/**
 	 * 删除 用户表

+ 3 - 1
src/main/resources/application-dev.yml

@@ -13,10 +13,11 @@ spring:
     #  commandTimeout: 5000
   datasource:
     # MySql
+#    url: jdbc:mysql://192.168.1.35:3306/sing-for-me?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     url: jdbc:mysql://192.168.1.218:3306/sing-for-me?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
     password: root@123456
-    #    password: root
+#    password: root
     # PostgreSQL
     #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
     #username: postgres
@@ -65,3 +66,4 @@ cmcc:
     signKey: f0463e4f8823
     # 回调地址
     callbackUrl: https://vote.guosen-fumao.cn/auth.html
+