融合下单

apply-net/pom.xml

@@ -85,6 +85,11 @@
             <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.winsun.framework</groupId>
+            <artifactId>winsun-utils-redis</artifactId>
+            <version>${winsun-framework.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.winsun.framework</groupId>

apply-net/src/main/java/com/winsun/controller/codeManagerController.java

@@ -332,31 +332,20 @@ public class codeManagerController {
         String accountNumber = request.getParameter("accountNumber");// 多媒体账号
         // 判断身份证号是否在清单中
         List<Map<String, Object>> list = orderMapper.selectReportOrder(idCard);
-        if (!list.isEmpty() && list.size() > 0) {
-            String orderSeq = list.get(0).get("kd_order_id").toString();
-            String user_type = list.get(0).get("user_type").toString();
-            String order_status = list.get(0).get("order_status").toString();
-            if(StringUtils.isNotBlank(user_type)&&(user_type.equals("3")||user_type.equals("5")||user_type.equals("9"))){
-                Wrapper<OrderView> wrapper = new EntityWrapper<>();
-                wrapper.eq(StringUtils.isNotBlank(orderSeq), "orderSeq", orderSeq);
-                wrapper.ne("status", OrderStatus.INVALID.getId());
-                List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
-                if(orderViews.isEmpty()){
-                    return ResponseData.error("订单异常");
-                }
-                if (StringUtils.isBlank(orderViews.get(0).getUptranseq())) {
-                    mapData.put("orderId", list.get(0).get("id").toString());
-                    mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
-                    mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面"
-                    return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面");
-                } else {
-                    mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
-                    mapData.put("uptranseq", orderViews.get(0).getUptranseq());
-                    mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
-                    return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
-                }
+        if(list.size()>0){
+            if (StringUtils.isBlank(list.get(0).get("uptranseq").toString())) {
+                mapData.put("orderId", list.get(0).get("orderId").toString());
+                mapData.put("orderSeq", list.get(0).get("orderSeq").toString());
+                mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面"
+                return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面");
+            } else {
+                mapData.put("orderSeq", list.get(0).get("orderSeq").toString());
+                mapData.put("uptranseq", list.get(0).get("uptranseq").toString());
+                mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
+                return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
             }
         }
+
         // 判断是否在宽带清单中
         List<Map<String, Object>> accountNumberList = orderMapper.checkOldKdUser(accountNumber);
         if(!accountNumberList.isEmpty() && accountNumberList.size() > 0) {  //已存在纪录

apply-net/src/main/resources/txtfiledetail.properties

-
-#############################################################################
-#ػFTP
-#
-ftp_host=127.0.0.1
-ftp_port=21
-ftp_username=root
-ftp_password=qUDZj/w2Rus=
-ftp_sys=E:/FTP
-
-hhr_img=/datas/apps/web/tomcats/apache-tomcat-7.0.100-hhr/hhrphoto
-#hhr_img=D:/a
-sign_img=/datas/apps/web/tomcats/apache-tomcat-7.0.100-hhr/hhr-sign-img
-#sign_img=D:/a
-yrym_sign=rQXPSHvWvHasj17#5L70ux3KvlWNqoVQ

common/src/main/java/com/winsun/bean/Order.java

@@ -340,19 +340,19 @@ public class Order implements Serializable{
 	/**
 	 *
 	 */
-	@TableField(value = "supervisor_name")
+	@TableField(value = "hehuoren_phone")
 	private String hehuorenPhone;
 
 	/**
 	 *
 	 */
-	@TableField(value = "lzgh")
+	@TableField(value = "supervisor_name")
 	private String supervisorName;
 
 	/**
 	 *
 	 */
-	@TableField(value = "order_number")
+	@TableField(value = "lzgh")
 	private String lzgh;
 
 	/**

common/src/main/java/com/winsun/bean/OrderView.java

@@ -160,5 +160,6 @@ public class OrderView implements Serializable {
     @TableField(value = "set_meal_index")
     private String setMealIndex;
 
-
+    @TableField(exist=false)
+    private String signImg;
 }
\ No newline at end of file

common/src/main/java/com/winsun/constant/FilePath.java

@@ -12,8 +12,9 @@ import java.util.Map;
 public enum FilePath {
     //
     BACKGROUNDIMG("套餐背景图片基础路径","enclosure"),
-    PATH("一人一码基础路径","enclosure/images/"),
-    IMPORTPATH("导出下载路径","enclosure/export/");
+    PATH("一人一码基础路径","D:/enclosure/images/"),
+    IMPORTPATH("导出下载路径","enclosure/export/"),
+    IMGURLPATH("受理协议表存放路径","imgUrl/");
     FilePath(String id, String value) {
         this.id = id;
         this.value = value;

common/src/main/java/com/winsun/utils/Base64ToImgUtils.java

 package com.winsun.utils;
 
+import org.springframework.stereotype.Component;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -13,8 +15,9 @@ import java.util.UUID;
  * Base64流转图片工具类
  * @author calvin
  */
+@Component
 public class Base64ToImgUtils {
-	public static String base64ToImg(String imgData, String hhr_img) throws IOException {
+	public String base64ToImg(String imgData, String hhr_img){
 		String filePath = "";
 		String uuid = UUID.randomUUID().toString().replaceAll("-", "");
 		uuid = uuid.substring(1, 12);
@@ -60,7 +63,7 @@ public class Base64ToImgUtils {
 		return filePath;
 	}
 	//path 为图片在服务器的绝对路径
-	public static String imgToBase64(String url) {
+	public String imgToBase64(String url) {
 		try {
 			File file = new File(url);
 			FileInputStream fis;

common/src/main/java/com/winsun/utils/RedisLockUtil.java

@@ -25,11 +25,15 @@ public class RedisLockUtil {
     * @param releaseTime 锁过期时间 防止死锁
     * @return
     */
-    public synchronized Boolean redisLock(String key,String value,long releaseTime){
+    public  Boolean redisLock(String key,String value,long releaseTime){
         try{
-            boolean boo = redisTemplate.opsForValue().setIfAbsent(key,value);
+            boolean boo = false;
+            synchronized(this){
+                boo = redisTemplate.opsForValue().setIfAbsent(key,value);
+            }
+
             if(boo){
-                redisTemplate.expire(key, 10, TimeUnit.SECONDS);
+                redisTemplate.expire(key, releaseTime, TimeUnit.SECONDS);
                 return true;
             }
         }catch (Exception e){

common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml

@@ -174,7 +174,7 @@
 
 
     <select id="selectReportOrder" parameterType="String" resultType="HashMap">
-        select * from hhr_order where user_type in('3','5','9','10') and order_status !='异常单' and id_card=#{idCard}
+        select * from order_view where orderNumber=#{idCard} and status in('100','未支付')
     </select>
 
     <select id="checkOldKdUser" parameterType="String" resultType="HashMap">