修改bug

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

@@ -92,7 +92,7 @@ public class PayApiController {
     public Response aliPay(JuHeZhongPayRequest request) {
         Response resp = new Response();
         try {
-            if("A".equals(request.getLevel())){
+            if("B".equals(request.getLevel())){
                 if(StringUtils.isBlank(request.getAfterMobile())){
                     resp.setStatus(ComCode.STATUS_CODE_4001);
                     resp.setMessage(ComCode.STATUS_CODE_4001_DESC);

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

@@ -766,13 +766,17 @@ public class PayApiService {
          }
 
          // 创建订单保存
-        if("C".equals(request.getLevel())){
+         if("D".equals(request.getLevel())){
+             request.setSubject("升级成白银会员");
+         }else if("C".equals(request.getLevel())){
              request.setSubject("升级成黄金会员");
+         }else if("B".equals(request.getLevel())){
+             request.setSubject("升级成钻石会员");
          }
          OrderEntity orderEntity = new OrderEntity(code, request.getSubMerchantCode(), payNo, payCode,request.getPayMethod(), "ali", "1",amount , request.getLevel() + ":" + request.getSubject(), "","0", request.getCardCode());
          payDao.saveOrderInfo(orderEntity);
 
-         if("A".equals(request.getLevel())){
+         if("B".equals(request.getLevel())){
              UpgradeUserEntity upgradeUserEntity = new UpgradeUserEntity();
              upgradeUserEntity.setUserCode(request.getSubMerchantCode());
              upgradeUserEntity.setLevel(request.getLevel());
@@ -873,7 +877,7 @@ public class PayApiService {
             if(orderEntity.getSubject() != null && !"".equals(orderEntity.getSubject())){
                 userEntity.setLevel(orderEntity.getSubject().substring(0,1));
 
-                if("A".equals(userEntity.getLevel())){
+                if("B".equals(userEntity.getLevel())){
                     UpgradeUserEntity upgradeUserEntity = new UpgradeUserEntity();
                     upgradeUserEntity.setUserCode(orderEntity.getUserCode());
                     upgradeUserEntity.setLevel(userEntity.getLevel());

src/main/resources/mappings/modules/pay/PayApiDao.xml

@@ -88,8 +88,15 @@
             pay_type,
             card_code
         FROM youka_orders
-        WHERE pay_no = #{payNo}
-        AND del_flag = 0
+        WHERE
+        del_flag = 0
+        <if test="payNo != null and payNo != ''">
+            AND pay_no = #{payNo}
+        </if>
+        <if test="payCode != null and payCode != ''">
+            AND pay_code = #{payCode}
+        </if>
+
     </select>
 
     <select id="getOrderListTimeing" resultType="com.thinkgem.jeesite.modules.pay.entity.OrderEntity">