feats

pom.xml

@@ -88,7 +88,7 @@
 		<dependency>
 			<groupId>com.github.binarywang</groupId>
 			<artifactId>weixin-java-miniapp</artifactId>
-			<version>4.2.0</version>
+			<version>4.3.0</version>
 		</dependency>
 		<!--weixin-miniapp start-->
 
@@ -101,7 +101,7 @@
 		<dependency>
 			<groupId>com.github.binarywang</groupId>
 			<artifactId>weixin-java-pay</artifactId>
-			<version>4.2.0</version>
+			<version>4.3.0</version>
 		</dependency>
 		<!--weixin-pay start-->
 

src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java

@@ -370,14 +370,14 @@ public class TaApplicationController extends BaseController {
         if (StringUtils.isEmpty(makeCardParam.getCardNo())) {
             return ResponseBean.error("卡号不能为空");
         } else {
-            TaCardNo taCardNo = iTaCardNoService.getUnuseCard(makeCardParam.getCardNo());
-            if (taCardNo != null) {
-                return ResponseBean.error("卡号无效或者已使用");
-            }
-
-            // 将卡号置为已使用
-            taCardNo.setStatus(Constants.STATUS_NORMAL);
-            iTaCardNoService.updateById(taCardNo);
+//            TaCardNo taCardNo = iTaCardNoService.getUnuseCard(makeCardParam.getCardNo());
+//            if (taCardNo != null) {
+//                return ResponseBean.error("卡号无效或者已使用");
+//            }
+//
+//            // 将卡号置为已使用
+//            taCardNo.setStatus(Constants.STATUS_NORMAL);
+//            iTaCardNoService.updateById(taCardNo);
 
             TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", makeCardParam.getCardNo(), false, true);
             if (null != taPetIdentity) {

src/main/java/com/njyunzhi/pet_identity/controller/TaPetIdentityController.java

@@ -154,8 +154,8 @@ public class TaPetIdentityController extends BaseController {
      */
     @RequestMapping(value="/wx/{clientId}/card/{id}",method= RequestMethod.GET)
     @ApiOperation(value="证件详情", notes = "证件详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPetIdentityGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_id", id, false, true);
+    public ResponseBean taPetIdentityGet(@ApiParam("证件号码") @PathVariable String id) throws Exception{
+        TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", id, false, true);
         if (null == taPetIdentity) {
             return ResponseBean.error("未找到证件信息");
         }

src/main/java/com/njyunzhi/pet_identity/service/impl/TaCardNoServiceImpl.java

@@ -43,6 +43,7 @@ public class TaCardNoServiceImpl extends ServiceImpl<TaCardNoMapper, TaCardNo> i
         if (StringUtils.isEmpty(cardNo)) return null;
 
         TaCardNo taCardNo = getById(cardNo);
+        if (null == taCardNo) return null;
 
         // 已经关联的无效
         if (Constants.STATUS_READY != taCardNo.getStatus()) return null;

src/main/java/com/njyunzhi/pet_identity/service/impl/TaMiniappQrcodeServiceImpl.java

@@ -39,6 +39,9 @@ public class TaMiniappQrcodeServiceImpl extends ServiceImpl<TaMiniappQrcodeMappe
     @Value("${weixin.miniapp.appid}")
     String miniAppid;
 
+    @Value("${yz.miniapp.qrEnv}")
+    String envVersion;
+
     @Override
     public TaMiniappQrcode createQRCode(String page, String scene) throws Exception {
         TaMiniappQrcode taMiniappQrcode = getByPageAndScene(page, scene);
@@ -79,7 +82,15 @@ public class TaMiniappQrcodeServiceImpl extends ServiceImpl<TaMiniappQrcodeMappe
      */
     private String buildMAQrCode(String page, String scene) throws WxErrorException, FileNotFoundException {
         WxMaQrcodeService qrcodeService = wxUtils.getMaService().getQrcodeService();
-        File qrFile = qrcodeService.createWxaCodeUnlimit(scene, page);
+        File qrFile = qrcodeService.createWxaCodeUnlimit(scene,
+                page,
+                false, // checkPath
+                envVersion,
+                430, // width
+                false, // autoColor
+                new WxMaCodeLineColor("0", "0", "0"), // lineColor
+                true // isHyaline 透明色
+                );
 
         return ossUtils.putObject(qrFile);
     }

src/main/resources/application-prod.yml

@@ -8,10 +8,12 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
   datasource:
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/ubpa?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: ubpa
-    password: ubpa@ABCD1234
+    url: jdbc:mysql://110.40.183.156:3306/pet_identity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: pet_identity
+    password: pet@ABCD1234
 
 yz:
+  miniapp:
+    qrEnv: release
   mode: prod
   cros: true

src/main/resources/application.yml

@@ -44,6 +44,7 @@ yz:
     servBase: https://pet-certificate-online.njyunzhi.com/api
   miniapp:
     qrpath: pages/qrcode/index
+    qrEnv: develop
   sms:
     ## ??????
     appid: ubpa