融合下单

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

@@ -178,6 +178,7 @@ public class RongHeController {
             orderView.setOrderName(orderName); // 姓名
             orderView.setOrderPhone(orderPhone); // 联系电话
             orderView.setOrderNumber(orderNumber); // 身份证号码
+            orderView.setOrderCustomerRemarks(banLiPhone);
             orderView.setOrderCustomerStudentId(orderCustomerStudentId);// 学生证号
             orderView.setOrderCustomerAccount(orderCustomerAccount);// 多媒体账号
             orderView.setOrderCustomerPwd(orderCustomerPwd);// 多媒体密码
@@ -245,7 +246,6 @@ public class RongHeController {
                 orderV.setOrderId(orderView.getOrderId());
                 orderV.setOrderSeq(orderSeq);
                 orderV.setWebOrderAmount(webOrderAmount);
-                orderV.setSignImg(filePath);
                 return ResponseData.success(orderV, "订单提交完成！");
             }
         }catch (Exception e){

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

@@ -331,16 +331,21 @@ public class codeManagerController {
         String idCard = request.getParameter("idCard"); // 身份证号
         String accountNumber = request.getParameter("accountNumber");// 多媒体账号
         // 判断身份证号是否在清单中
-        List<Map<String, Object>> list = orderMapper.selectReportOrder(idCard);
+        List<Order> list = orderMapper.selectRepeatOrder(idCard);
         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());
+            List<OrderView> list1 = orderMapper.selectReportOrder(list.get(0).getKdOrderId());
+            if (StringUtils.isBlank(list1.get(0).getUptranseq())) {
+                mapData.put("orderId", list1.get(0).getOrderId());
+                mapData.put("orderSeq", list1.get(0).getOrderSeq());
+                mapData.put("userType", list.get(0).getUserType());
+                mapData.put("kapin", list.get(0).getKapin());
                 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("orderSeq", list1.get(0).getOrderSeq());
+                mapData.put("uptranseq", list1.get(0).getUptranseq());
+                mapData.put("userType", list.get(0).getUserType());
+                mapData.put("kapin", list.get(0).getKapin());
                 mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
                 return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
             }
@@ -348,10 +353,12 @@ public class codeManagerController {
 
         // 判断是否在宽带清单中
         List<Map<String, Object>> accountNumberList = orderMapper.checkOldKdUser(accountNumber);
+        //  查询多媒体账号在甲方提供清单中是否存在
         if(!accountNumberList.isEmpty() && accountNumberList.size() > 0) {  //已存在纪录
             mapData.put("code", 1);
             return ResponseData.error(mapData,"该账号已存在");
         } else {
+            //  查询多媒体账号在订单表是否存在
             List<Map<String, Object>> maps = orderMapper.checkOldhhrOrder(accountNumber);
             if(!maps.isEmpty() && maps.size()>0){
                 mapData.put("code", 1);

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

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

common/src/main/java/com/winsun/mapper/OrderMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.winsun.bean.BroadBandOrder;
 import com.winsun.bean.Order;
+import com.winsun.bean.OrderView;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Component;
 
@@ -111,10 +112,10 @@ public interface OrderMapper extends BaseMapper<Order> {
 
     /**
      * 查询多媒体账号在甲方提供清单中是否存在
-     * @param idCard
+     * @param orderSeq
      * @return
      */
-    List<Map<String, Object>> selectReportOrder(String idCard);
+    List<OrderView> selectReportOrder(String orderSeq);
     /**
      * 查询多媒体账号在甲方提供清单中是否存在
      * @param accountNumber

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

@@ -173,8 +173,8 @@
     </select>
 
 
-    <select id="selectReportOrder" parameterType="String" resultType="HashMap">
-        select * from order_view where orderNumber=#{idCard} and status in('100','未支付')
+    <select id="selectReportOrder" parameterType="String" resultType="com.winsun.bean.OrderView">
+        select * from order_view where orderSeq = #{orderSeq}
     </select>
 
     <select id="checkOldKdUser" parameterType="String" resultType="HashMap">