修改待升级砖石会员

pom.xml

@@ -668,6 +668,18 @@
             <version>3.0.0</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-httpclient/commons-httpclient -->
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/thinkgem/jeesite/modules/pay/api/PayApiController.java

@@ -14,6 +14,7 @@ import com.thinkgem.jeesite.modules.user.bean.UserRequest;
 import com.thinkgem.jeesite.modules.user.entity.BelongBankEntity;
 import com.thinkgem.jeesite.modules.user.entity.CardEntity;
 import com.thinkgem.jeesite.modules.user.entity.CardSwpaccidEntity;
+import com.thinkgem.jeesite.modules.user.entity.UserEntity;
 import com.thinkgem.jeesite.modules.user.service.UserApiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpRequest;
@@ -90,7 +91,14 @@ public class PayApiController {
     public Response aliPay(JuHeZhongPayRequest request) {
         Response resp = new Response();
         try {
-
+            if("A".equals(request.getLevel())){
+                UserEntity userEntity = userApiService.checkMobile(request.getAfterMobile());
+                if(userEntity != null){
+                    resp.setStatus(ComCode.STATUS_CODE_4007);
+                    resp.setMessage(ComCode.STATUS_CODE_4007_DESC);
+                    return resp;
+                }
+            }
             PayBackDto payBackDto = payService.aliPay(request);
             resp.setStatus(ComCode.STATUS_CODE_2000);
             resp.setMessage(ComCode.STATUS_CODE_2000_DESC);

src/main/java/com/thinkgem/jeesite/modules/pay/juhezhong/utils/HttpUtil.java

@@ -224,6 +224,39 @@ public class HttpUtil {
         }
     }
 
+    public static String postXml(String url, String xml) throws Exception {
+        CloseableHttpClient httpclient = HttpClients.custom().setConnectionManager(cm).build();
+        HttpPost httpPost = null;
+        CloseableHttpResponse response = null;
+        String str = "";
+        try {
+
+            httpPost = new HttpPost(url);
+            StringEntity postingString = new StringEntity(xml,"UTF-8");// json传递
+            httpPost.setEntity(postingString);
+            httpPost.setHeader("Content-type", "application/xml");
+            response = httpclient.execute(httpPost);
+            try {
+                HttpEntity entity = response.getEntity();
+                str = EntityUtils.toString(entity,"UTF-8");
+                log.debug("httpclient调用状态:" + response.getStatusLine());
+                log.debug("httpclient调用结果{}", str);
+                // return EntityUtils.toString(response.getEntity());
+                return str;
+            } finally {
+                response.close();
+            }
+
+        } finally {
+            if (response != null) {
+                response.close();
+            }
+            if (httpPost != null) {
+                httpPost.releaseConnection();
+            }
+        }
+    }
+
     public static String postRaw(String url, String json) throws Exception {
 
         // HttpClient httpclient = new DefaultHttpClient(); 已经过期采用新的类

src/main/java/com/thinkgem/jeesite/modules/pay/pinganbank/PingAnBankService.java

+package com.thinkgem.jeesite.modules.pay.pinganbank;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+
+public class PingAnBankService {
+
+    public static void main(String args[]) throws Exception {
+
+//		String url = "http://127.0.0.1:7072/";
+//		String xml = "";
+//		HttpUtil.postXml(url,xml);
+
+        String res = "A0010101020020108050000801500000000001074001  123450120120620151810201206180000011037  000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000<?xml version=\"1.0\" encoding=\"GBK\"?>" +
+                "<Result>" +
+                "<BatchNo>201603260001</BatchNo>" +
+                "<AcctNo>11014891204004</AcctNo>" +
+                "<BusiType>00000</BusiType>" +
+                "<CorpId>E000070730</CorpId>" +
+                "<TotalNum>2</TotalNum>" +
+                "<TotalAmount>50</TotalAmount>" +
+                "<FileName>req_20160326_0001.txt</FileName>" +
+                "<RandomPwd>mem12Xv0vc+chHRyXHT8HWlcXVQTHZWQ</RandomPwd>" +
+                "<HashData></HashData>" +
+                "<SignData></SignData>" +
+                "<Remark>备注信息</Remark>" +
+                "</Result>";
+
+        PostMethod postMethod = new PostMethod(
+                "http://127.0.0.1:7072");
+
+        postMethod.setRequestEntity(new StringRequestEntity(
+                res, "text/html", "GBK"));
+        postMethod.setRequestHeader("Content-Type",
+                "text/xml; charset=GBK");
+
+        HttpClient httpClient = new HttpClient();
+        int resultint = httpClient.executeMethod(postMethod);
+        res = new String(postMethod.getResponseBody(),"GBK");
+        System.out.println("http response:" + res);
+        postMethod.releaseConnection();
+        System.out.println(resultint);
+
+    }
+}

src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java

@@ -691,6 +691,14 @@ public class PayApiService {
          OrderEntity orderEntity = new OrderEntity(code, request.getSubMerchantCode(), payNo, payCode,request.getPayMethod(), "ali", "1",amount , request.getLevel() + ":" + request.getSubject(), "","0", request.getCardCode());
          payDao.saveOrderInfo(orderEntity);
 
+         UpgradeUserEntity upgradeUserEntity = new UpgradeUserEntity();
+         upgradeUserEntity.setUserCode(request.getSubMerchantCode());
+         upgradeUserEntity.setLevel(request.getLevel());
+         upgradeUserEntity.setOrderCode(payCode);
+         upgradeUserEntity.setStatus("0");
+         upgradeUserEntity.setAfterMobile(request.getAfterMobile());
+         userService.addUpgradeUser(upgradeUserEntity);
+
          // 支付宝支付返回对应支付信息
          JSONObject dto = new JSONObject();
          dto.put("payCode",payCode);
@@ -780,13 +788,33 @@ public class PayApiService {
 
             if(orderEntity.getSubject() != null && !"".equals(orderEntity.getSubject())){
                 userEntity.setLevel(orderEntity.getSubject().substring(0,1));
+
+                if("A".equals(userEntity.getLevel())){
+                    UpgradeUserEntity upgradeUserEntity = new UpgradeUserEntity();
+                    upgradeUserEntity.setUserCode(orderEntity.getUserCode());
+                    upgradeUserEntity.setLevel(userEntity.getLevel());
+                    upgradeUserEntity.setStatus("1");
+                    upgradeUserEntity.setOrderCode(orderEntity.getPayCode());
+                    userService.updateUpgradeUser(upgradeUserEntity);
+                }else{
+                    userService.updateUserLevelByCode(userEntity);
+                }
             }
 
-            userService.updateUserLevel(userEntity);
+
         }else{
             orderEntity.setPayStatus("4");
             payDao.updateOrderStatus(orderEntity);
             orderEntity = payDao.getOrder(orderEntity);
+
+            if(orderEntity.getSubject() != null && !"".equals(orderEntity.getSubject()) && "A".equals(orderEntity.getSubject().substring(0,1))){
+                UpgradeUserEntity upgradeUserEntity = new UpgradeUserEntity();
+                upgradeUserEntity.setUserCode(orderEntity.getUserCode());
+                upgradeUserEntity.setLevel(orderEntity.getSubject().substring(0,1));
+                upgradeUserEntity.setOrderCode(orderEntity.getPayCode());
+                upgradeUserEntity.setStatus("3");
+                userService.updateUpgradeUser(upgradeUserEntity);
+            }
         }
         return orderEntity;
     }

src/main/java/com/thinkgem/jeesite/modules/user/bean/JuHeZhongPayRequest.java

@@ -18,6 +18,8 @@ public class JuHeZhongPayRequest extends Request {
 
     private String expireDate;// 过期时间
 
+    private String afterMobile;// 升级之后变更的手机号
+
     public String getAmount() {
         return amount;
     }
@@ -97,4 +99,12 @@ public class JuHeZhongPayRequest extends Request {
     public void setLevel(String level) {
         this.level = level;
     }
+
+    public String getAfterMobile() {
+        return afterMobile;
+    }
+
+    public void setAfterMobile(String afterMobile) {
+        this.afterMobile = afterMobile;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/user/dao/UserApiDao.java

@@ -65,6 +65,8 @@ public interface UserApiDao {
 
     void updateUserLevel(UserEntity recommendedUser);
 
+    void updateUserLevelByCode(UserEntity recommendedUser);
+
     List<CardEntity> getRecommendCardsInfo(UserEntity recommendedUser);
 
     void updateCardNoDebit(UserRequest request);
@@ -100,4 +102,11 @@ public interface UserApiDao {
     public CardSwpaccidEntity getSwpaccid(CardSwpaccidEntity cardSwpaccidEntity);
 
     CardEntity getCardInfoSwpaccid(Request request);
+
+
+    // 添加 待升级王者的用户记录表
+    public Integer addUpgradeUser(UpgradeUserEntity entity);
+
+    // 更新 待升级王者的用户记录表
+    public Integer updateUpgradeUser(UpgradeUserEntity entity);
 }

src/main/java/com/thinkgem/jeesite/modules/user/entity/UpgradeUserEntity.java

+package com.thinkgem.jeesite.modules.user.entity;
+
+import com.thinkgem.jeesite.common.baseBean.BaseEntity;
+
+import java.io.Serializable;
+
+public class UpgradeUserEntity  extends BaseEntity implements Serializable {
+    private String userCode;
+
+    private String afterMobile;
+
+    private String level;
+
+    private String status;
+
+    private String orderCode;
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getAfterMobile() {
+        return afterMobile;
+    }
+
+    public void setAfterMobile(String afterMobile) {
+        this.afterMobile = afterMobile;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+}

src/main/java/com/thinkgem/jeesite/modules/user/entity/UserEntity.java

@@ -24,6 +24,8 @@ public class UserEntity extends BaseEntity implements Serializable {
     private String status; // 状态 0未实名 1审核中 2已实名
     private UserDetailEntity userDetail; // 用户详情
 
+    private String levelStatus;
+
     public UserEntity() {
     }
 
@@ -134,4 +136,12 @@ public class UserEntity extends BaseEntity implements Serializable {
     public void setUserDetail(UserDetailEntity userDetail) {
         this.userDetail = userDetail;
     }
+
+    public String getLevelStatus() {
+        return levelStatus;
+    }
+
+    public void setLevelStatus(String levelStatus) {
+        this.levelStatus = levelStatus;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.thinkgem.jeesite.common.baseBean.Request;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.constant.ComCode;
+import com.thinkgem.jeesite.common.utils.DateUtils;
 import com.thinkgem.jeesite.common.utils.IdGen;
 import com.thinkgem.jeesite.common.utils.MD5;
 import com.thinkgem.jeesite.modules.commonError.MyException;
@@ -121,6 +122,12 @@ public class UserApiService {
         return userDao.checkMobile(request);
     }
 
+    public UserEntity checkMobile(String mobile) {
+        UserRequest request = new UserRequest();
+        request.setMobile(mobile);
+        return userDao.checkMobile(request);
+    }
+
     @Transactional(readOnly = false)
     public UserEntity signUp(UserRequest request) {
         // 保存用户信息
@@ -713,7 +720,25 @@ public class UserApiService {
 
     }
 
-    public void updateUserLevel(UserEntity recommendedUser){
-        userDao.updateUserLevel(recommendedUser);
+    public void updateUserLevelByCode(UserEntity recommendedUser){
+        userDao.updateUserLevelByCode(recommendedUser);
+    }
+
+    // 添加 待升级王者的用户记录表
+    public Integer addUpgradeUser(UpgradeUserEntity upgradeUserEntity){
+        upgradeUserEntity.setCreated(DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        upgradeUserEntity.setCreatedUser("sys");
+        upgradeUserEntity.setModified(DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        upgradeUserEntity.setModifiedUser("sys");
+
+        return userDao.addUpgradeUser(upgradeUserEntity);
+    }
+
+    // 更新 待升级王者的用户记录表
+    public Integer updateUpgradeUser(UpgradeUserEntity upgradeUserEntity){
+        upgradeUserEntity.setModified(DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        upgradeUserEntity.setModifiedUser("sys");
+
+        return userDao.updateUpgradeUser(upgradeUserEntity);
     }
 }

src/main/java/com/thinkgem/jeesite/test/service/TestDataMainService.java

@@ -5,6 +5,20 @@ package com.thinkgem.jeesite.test.service;
 
 import java.util.List;
 
+import com.thinkgem.jeesite.modules.pay.juhezhong.utils.HttpUtil;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,5 +84,5 @@ public class TestDataMainService extends CrudService<TestDataMainDao, TestDataMa
 		super.delete(testDataMain);
 		testDataChildDao.delete(new TestDataChild(testDataMain));
 	}
-	
+
 }
\ No newline at end of file

src/main/resources/mappings/modules/user/UserDao.xml

@@ -548,6 +548,16 @@
             AND level = 'E'
     </update>
 
+    <update id="updateUserLevelByCode">
+        UPDATE
+        youka_users
+        SET
+        level = #{level}
+        WHERE
+        code = #{code}
+    </update>
+
+
     <select id="getRecommendCardsInfo" resultType="com.thinkgem.jeesite.modules.user.entity.CardEntity">
         SELECT
             yc.id,
@@ -849,4 +859,40 @@
         AND pay_channel = #{payChannel}
 
     </select>
+
+
+    <insert id="addUpgradeUser">
+        INSERT INTO youka_upgrade_user(
+          user_code,
+          after_mobile,
+          order_code,
+          `level`,
+          status,
+          created,
+          create_by,
+          update_date,
+          update_by
+
+        )VALUES(
+           #{userCode},
+           #{afterMobile},
+           #{orderCode},
+           #{level},
+           #{status},
+           #{created},
+           #{createdUser},
+           #{modified},
+           #{modifiedUser}
+        )
+    </insert>
+
+    <update id="updateUpgradeUser">
+        UPDATE youka_upgrade_user
+          SET status = #{status},
+          update_date = #{modified},
+          update_by = #{modifiedUser}
+          WHERE user_code = #{userCode}
+          AND level = #{level}
+          AND order_code = #{orderCode}
+    </update>
 </mapper>
\ No newline at end of file