fix 支付回调

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserBankQuestionRecordController.java

@@ -58,4 +58,17 @@ public class UserBankQuestionRecordController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询用户做的历史题库题目记录列表
+     */
+    @ApiOperation("查询用户做历史列表")
+    @GetMapping("/doneList")
+    public TableDataInfo<UserBankQuestionRecordVo> doneList(UserBankQuestionRecordQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
+        List<UserBankQuestionRecordVo> list = iUserBankQuestionRecordService.queryDoneList(bo);
+        return getDataTable(list);
+    }
+
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/wx/WxPayController.java

@@ -52,9 +52,9 @@ public class WxPayController
 
     @ApiOperation("获取支付回调凭证")
     @PostMapping("/callback")
-    public AjaxResult callback(@RequestBody String notifyData)
+    public String callback(@RequestBody String notifyData)
     {
-        return AjaxResult.success(iWxPayService.paymentCallBack(notifyData));
+        return iWxPayService.paymentCallBack(notifyData);
     }
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -99,7 +99,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-
         return this.save(add);
     }
 
@@ -149,7 +148,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if(!this.save(add)){
             return null;
         }
-        System.out.println(out_trade_no);
         Map<String, String> result =  iWxPayService.payment(out_trade_no,userVo.getOpenId(),body,price);
         return result;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserBankQuestionRecordMapper.java

@@ -17,4 +17,6 @@ public interface UserBankQuestionRecordMapper extends BaseMapper<UserBankQuestio
 
     List<UserBankQuestionRecordVo> queryWrongList(UserBankQuestionRecordQueryBo bo);
 
+    List<UserBankQuestionRecordVo> queryDoneList(UserBankQuestionRecordQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserBankQuestionRecordService.java

@@ -32,6 +32,10 @@ public interface IUserBankQuestionRecordService extends IService<UserBankQuestio
 	 * 查询错题列表
 	 */
 	List<UserBankQuestionRecordVo> queryWrongList(UserBankQuestionRecordQueryBo bo);
+	/**
+	 * 查询做过题列表
+	 */
+	List<UserBankQuestionRecordVo> queryDoneList(UserBankQuestionRecordQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入用户做的历史题库题目记录

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserBankQuestionRecordServiceImpl.java

@@ -58,6 +58,11 @@ public class UserBankQuestionRecordServiceImpl extends ServiceImpl<UserBankQuest
         return userBankQuestionRecordMapper.queryWrongList(bo);
     }
 
+    @Override
+    public List<UserBankQuestionRecordVo> queryDoneList(UserBankQuestionRecordQueryBo bo) {
+        return userBankQuestionRecordMapper.queryDoneList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -130,16 +130,23 @@ public class WxPayServiceImpl  implements IWxPayService {
             Map<String, String> notifyMap = WXPayUtil.xmlToMap(notifyData);  // 转换成map
 
             if (wxpay.isPayResultNotifySignatureValid(notifyMap)) {
-                String out_trade_no = notifyMap.get("out_trade_no");
-                String transaction_id = notifyMap.get("transaction_id");
-                Order order = iOrderService.queryByOrderSn(out_trade_no);
-                if(order.getOrderStatus()==0){
-                    order.setOrderStatus(1);
-                    order.setPayTime(DateUtils.getNowTime());
-                    order.setTransid(transaction_id);
-                    order.setOrderGeneral(out_trade_no);
-                    if(iOrderService.updateById(order)){
-
+                String result_code = notifyMap.get("result_code");
+                if("SUCCESS".equals(result_code)){
+                    String out_trade_no = notifyMap.get("out_trade_no");
+                    String transaction_id = notifyMap.get("transaction_id");
+                    Order order = iOrderService.queryByOrderSn(out_trade_no);
+                    if(order.getOrderStatus()==0){
+                        order.setOrderStatus(1);
+                        order.setPayTime(DateUtils.getNowTime());
+                        order.setTransid(transaction_id);
+                        order.setOrderGeneral(out_trade_no);
+                        if(iOrderService.updateById(order)){
+                            Map<String,String> result = new HashMap<>();
+                            result.put("return_code","<![CDATA[SUCCESS]]>");
+                            result.put("return_msg","<![CDATA[OK]]>");
+                            String resultXml = WXPayUtil.mapToXml(result);
+                            return resultXml;
+                        }
                     }
                 }
             }

zhongzheng-system/src/main/resources/mapper/modules/user/UserBankQuestionRecordMapper.xml

@@ -37,4 +37,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
+    <select id="queryDoneList" parameterType="com.zhongzheng.modules.user.domain.UserBankQuestionRecord"  resultType="com.zhongzheng.modules.bank.domain.Question">
+        SELECT
+        ubqr.is_right,
+        q.*
+        FROM
+        user_bank_question_record ubqr
+        LEFT JOIN question q ON ubqr.question_id = q.question_id
+        WHERE
+        1 = 1
+        <if test="userId != null and userId != ''">
+            AND user_id = #{userId}
+        </if>
+        AND ubqr.bank_id = #{bankId}
+        GROUP BY
+        ubqr.question_id
+
+    </select>
+
 </mapper>