pda核销接口修改

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/dao/CouponrecordMapper.java

@@ -51,4 +51,10 @@ public interface CouponrecordMapper extends GenericDao<Couponrecord> {
      * @return
      */
     Couponrecord isWriteOff(String number);
+    /**
+     * 根据设备号获取医院id
+     * @param facilityNo
+     * @return
+     */
+    Long getHospitalIdByfaNo(String facilityNo);
 }
\ No newline at end of file

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/dao/CouponrecordMapper.xml

@@ -265,15 +265,20 @@
     </update>
     <insert id="insertPdaLog" parameterType="java.util.Map"  useGeneratedKeys="true"
             keyProperty="id">
-    insert into t_aidea_coupon_record (id,content,create_time)
+    insert into t_aidea_PdaLog (id,content,create_time)
     values
     (#{id, jdbcType=VARCHAR},#{content, jdbcType=VARCHAR},now())
     </insert>
     <select id="isWriteOff"  resultMap="resultMap">
         SELECT
-        <include refid="sqlColumns"/>
+        id,status
         FROM t_aidea_coupon_record
         where number=#{number}
     </select>
+    <select id="getHospitalIdByfaNo"  resultType="java.lang.Long">
+        SELECT
+        id
+        FROM t_aidea_hospital t WHERE t.facility_no=#{facilityNo}
+    </select>
 
 </mapper>
\ No newline at end of file

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/service/impl/PdaCouponrecordServiceImpl.java

@@ -32,10 +32,12 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService {
             //是否已核销
             Couponrecord info = couponrecordMapper.isWriteOff(number);
             if(info!=null){
-                if(info.getStatus().equals(1)){
+                if(info.getStatus().equals("1")){
+                    long hospitalId = couponrecordMapper.getHospitalIdByfaNo(facilityNo);
                     info.setStatus("2");
                     info.setVerifDate(new Date());
-                  //  info.setFacilityNo(facilityNo);
+                    info.setFacilityNo(facilityNo);
+                    info.setHospitalId(hospitalId);
                     couponrecordMapper.update(info);
                     rtnJson.put("code", 200);
                     rtnJson.put("msg", "验证成功！");
@@ -43,14 +45,14 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService {
                     map.put("id",logId);
                     map.put("resultJson",rtnJson.toString());
                     map.put("status",2);
-                }else if(info.getStatus().equals(0)){
+                }else if(info.getStatus().equals("0")){
                     rtnJson.put("code", 500);
                     rtnJson.put("msg", "检测券未激活！");
                     map = new HashMap<String,Object>();
                     map.put("id",logId);
                     map.put("resultJson",rtnJson.toString());
                     map.put("status",1);
-                }else if(info.getStatus().equals(2)){
+                }else if(info.getStatus().equals("2")){
                     rtnJson.put("code", 500);
                     rtnJson.put("msg", "检测券已使用！");
                     map = new HashMap<String,Object>();