小优化

src/main/java/thyyxxk/wxservice_server/controller/api/PowersiMiPayPlugin.java

@@ -263,7 +263,7 @@ public class PowersiMiPayPlugin {
     @PassToken
     @GetMapping("/isMipOrder")
     public ResultVo<String> isMipOrder(@RequestParam("hisOrdNum") String hisOrdNum) throws Exception {
-        PowersiMipSetlinfo setlinfo = getSetlinfo(hisOrdNum, OrdState.SETTLED);
+        PowersiMipSetlinfo setlinfo = getSetlinfo(hisOrdNum, null);
         if (null == setlinfo) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }
@@ -275,6 +275,10 @@ public class PowersiMiPayPlugin {
     public ResultVo<String> revokeMipSettle(@RequestBody CommonRequest request) throws Exception {
         PowersiMipSetlinfo setlinfo = getRefundableSetl(request.getHisOrdNum());
         if (null == setlinfo) {
+            setlinfo = getSetlinfo(request.getHisOrdNum(), OrdState.REFUND_SUCCEED);
+            if (null != setlinfo) {
+                return ResultVoUtil.success("医保移动支付退款成功");
+            }
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有可以退款的结算交易。");
         }
         Date now = new Date();
@@ -339,6 +343,13 @@ public class PowersiMiPayPlugin {
     private PowersiMipSetlinfo getSetlinfo(String id, OrdState state) {
         QueryWrapper<PowersiMipSetlinfo> wrapper = new QueryWrapper<>();
         wrapper.eq("med_org_ord", id);
+        if (null == state) {
+            List<PowersiMipSetlinfo> list = dao.selectList(wrapper);
+            if (list == null || list.isEmpty()) {
+                return null;
+            }
+            return list.get(0);
+        }
         wrapper.eq("ord_state", state);
         return dao.selectOne(wrapper);
     }

src/main/java/thyyxxk/wxservice_server/utils/mip/DataHandler.java

@@ -12,11 +12,6 @@ import thyyxxk.wxservice_server.config.exception.BizException;
 
 @Slf4j
 public class DataHandler {
-//    private final static String appID = "FBEBNX3X60526RPYJQ7PZ4CRPNZO8NC9";
-//    private final static String secret = "SN7YCGQA4R1JJELBZNGKEMV3O4P9KF9F";
-//    private final static String prvKey = "ATePKWH4x/ooLSoA5A5rxDrCgCbhFzPG/FvdqF2RkEI=";
-//    private final static String pubKey = "BLaISfgVDY1OdD22WBSXO1z/PwHialH1lKxeB1SN7ZkCPEutbMCUpIJnl/009sXoXw7ubAHxfpHyn2aSgXAvkHI=";
-
     private final static String appID = "4RB94HUMN03WOV9M301JKXIF2L8T6ZJR";
     private final static String secret = "8GPMQXC2KHVU5C9W232XCKHYM2B9XPJU";
     private final static String prvKey = "ALXJ5ibdGg/zXFdTzNx/e3UvsvSRE62hcmQkSjFpBkP4";
@@ -75,7 +70,7 @@ public class DataHandler {
                 String dEncData = new String(cipherByte, StandardCharsets.UTF_8);
                 dataObject = JSONObject.parseObject(dEncData);
             } catch (Exception var9) {
-                throw new BizException("医保移动支付解密出错。");
+                throw new BizException("医保移动支付解密出错：" + var9.getMessage());
             }
             rspJSON.put("data", dataObject);
             rspJSON.remove("encData");

src/main/resources/application-dev.yml

@@ -44,7 +44,7 @@ mybatis-plus:
 thyy:
   apiAddr:
     his-mip-api: http://172.16.30.26:1100/mobilePayApi
-    thmz-api: http://172.16.30.99:8089/thmz/api/v1
+    thmz-api: http://172.16.30.119:8089/thmz/api/v1
     chronic-api: http://172.16.32.160:8077/chronicDisease
     physical-check-api: http://172.16.32.183:8888/bdp/dataservice/api
     add-face-api: http://172.16.30.66:20923/thyy/api/haikang/door/addFaceRecognition

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: prod
+    active: dev