Merge branch 'V3.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into V3.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/PayNotifyPerproties.java

@@ -39,4 +39,9 @@ public class PayNotifyPerproties {
      * 微信临时车回调
      */
     private String wxTmpNotify;
+    
+    /**
+     * 支付宝临时车回调
+     */
+    private String aliTmpNotify;
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AliMPUserController.java

@@ -0,0 +1,179 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.feign.IFuShiServer;
+import com.community.huiju.service.AliMPUserServiceI;
+import com.community.huiju.service.WxMPUserServiceI;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
+
+/**
+ * @author FXF
+ * @date 2019-07-08
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "支付宝生活号API", description = "支付宝生活号API")
+public class AliMPUserController {
+	
+	private Logger log = LoggerFactory.getLogger(AliMPUserController.class);
+	
+	@Value("${ali.mp.configs.appId}")
+	private String appId;
+	
+	@Value("${ali.mp.configs.secret}")
+	private String secret;
+	
+	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
+	private String ALIPAY_PUBLIC_KEY;
+	
+	@Autowired
+	private AliMPUserServiceI aliMPUserService;
+	
+	@Autowired
+	private IFuShiServer fuShiServer;
+
+	@RequestMapping(value = "/alimp/info", method = RequestMethod.GET)
+	@ApiOperation(value = "获取支付宝生活号相关信息", notes = "获取支付宝生活号相关信息")
+	@ApiImplicitParams({})
+	public ResponseBean getAliMPinfo(){
+		ResponseBean responseBean = new ResponseBean();
+		Map<String,Object> map = Maps.newHashMap();
+		map.put("appId",appId);
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+	
+	@RequestMapping(value = "/{communityId}/alimp", method = RequestMethod.GET)
+	@ApiOperation(value = "根据CODE获取OPENID并判断是否第一次来,并返回数据", notes = "根据CODE获取OPENID并判断是否第一次来,并返回数据")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "支付宝code")})
+	public ResponseBean getUseridByCode(@PathVariable Integer communityId, @RequestParam String code){
+		ResponseBean responseBean = aliMPUserService.getTemporaryData(code,appId,secret,communityId);
+		return responseBean;
+	}
+	
+	
+	@RequestMapping(value = "/{communityId}/alimp/records", method = RequestMethod.GET)
+	@ApiOperation(value = "根据openid获取缴费记录", notes = "根据openid获取缴费记录")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "opneid", value = "支付宝opneid")})
+	public ResponseBean getRecordsByOpenid(@PathVariable Integer communityId, @RequestParam String opneid){
+		ResponseBean responseBean = aliMPUserService.getRecordsByOpenid(opneid,communityId);
+		return responseBean;
+	}
+	
+	@RequestMapping(value = "/{communityId}/alimp/car", method = RequestMethod.GET)
+	@ApiOperation(value = "根据车牌获取数据", notes = "根据车牌获取数据")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "carNo", value = "车牌号")})
+	public ResponseBean getParkInfoByCarNo(@PathVariable Integer communityId, @RequestParam String carNo){
+		ResponseBean responseBean = new ResponseBean();
+		String parkInfoByCarNo = fuShiServer.getParkInfoByCarNo(carNo);
+		JSONObject carNoJson = JSONObject.parseObject(parkInfoByCarNo);
+		//车辆不在停车场
+		if (carNoJson.getInteger("code") == 1){
+			responseBean.addError(carNoJson.getString("message"));
+			return responseBean;
+		}
+		
+		if (carNoJson.getInteger("code") == 0 ){
+			if (carNoJson.getJSONObject("data").getInteger("DataType") != 3){
+				responseBean.addSuccess("储值车不支持在线缴费，月卡车请使用银城慧家APP延期续费");
+				return responseBean;
+			}
+			//返回查询的金额
+			JSONObject jsonParam = carNoJson.getJSONObject("data").getJSONObject("JsonParam");
+			Map<String,Object> resultMap = Maps.newHashMap();
+			resultMap.put("ActualAmount",jsonParam.get("ActualAmount"));
+			responseBean.addSuccess(resultMap);
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "临时车统一下单", notes = "临时车统一下单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "carNo", value = "车牌号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "支付宝openid")
+	})
+	@RequestMapping(value = "/{communityId}/alimp/order",method = RequestMethod.GET)
+	public ResponseBean aliTmpOrder(@PathVariable Integer communityId,
+	                               @RequestParam("carNo") String carNo,
+	                               @RequestParam("openid") String openid){
+		ResponseBean responseBean = new ResponseBean();
+		
+		//String parkInfoByCarNo = fuShiServer.getParkInfoByCarNo(carNo);
+		//JSONObject carNoJson = JSONObject.parseObject(parkInfoByCarNo);
+		//String actualAmount = String.valueOf(Double.valueOf(((BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount")).toString()) * 100);
+		//actualAmount = actualAmount.substring(0, actualAmount.lastIndexOf("."));
+		//String resp = wxMPUserService.wxTmpOrder(carNo,actualAmount,communityId,openid,(BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount"));
+		String resp = aliMPUserService.aliTmpOrder(carNo,"1",communityId,openid,new BigDecimal("0.1"));
+		
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "手机订单支付完成后回调临时车缴费", notes = "手机订单支付完成后回调临时车缴费")
+	@RequestMapping(value = "/aliTmpNotify",method = RequestMethod.POST)
+	public void wxBillNotify(HttpServletRequest request, HttpServletResponse response){
+		log.info("支付宝 alipay result  start =======");
+		Map<String,String> params = new HashMap<String,String>();
+		Map requestParams = request.getParameterMap();
+		for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
+			String name = (String) iter.next();
+			String[] values = (String[]) requestParams.get(name);
+			String valueStr = "";
+			for (int i = 0; i < values.length; i++) {
+				valueStr = (i == values.length - 1) ? valueStr + values[i]
+						: valueStr + values[i] + ",";
+			}
+			//乱码解决，这段代码在出现乱码时使用。
+			//valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
+			params.put(name, valueStr);
+		}
+		//切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
+		try {
+			boolean flag = AlipaySignature.rsaCheckV1(params, ALIPAY_PUBLIC_KEY, CHARSET_UTF8,"RSA2");
+			if (flag){
+				aliMPUserService.updateTmpOrder(params.get("out_trade_no"));
+			}
+		} catch (AlipayApiException e) {
+			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+	}
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaTemporaryLicenseOrderMapper.java

@@ -10,13 +10,13 @@ import java.util.Map;
 @Mapper
 public interface TaTemporaryLicenseOrderMapper {
 	
-	List<Map<String, Object>> getLicensePlateByOpenid(@Param("openid") String openid,@Param("communityId") Integer communityId);
+	List<Map<String, Object>> getLicensePlateByOpenid(@Param("openid") String openid,@Param("communityId") Integer communityId,@Param("paymentType") String paymentType);
 	
-	List<Map<String, Object>> getLicensePlateRecordsByOpenid(@Param("openid") String openid,@Param("communityId") Integer communityId);
+	List<Map<String, Object>> getLicensePlateRecordsByOpenid(@Param("openid") String openid,@Param("communityId") Integer communityId,@Param("paymentType") String paymentType);
 	
-	int saveTmpOrder(@Param("communityId") Integer communityId, @Param("orderNo") String orderNo, @Param("actualAmount") String actualAmount, @Param("openid") String openid, @Param("carNo") String carNo,@Param("price") BigDecimal price);
+	int saveTmpOrder(@Param("communityId") Integer communityId, @Param("orderNo") String orderNo, @Param("actualAmount") String actualAmount, @Param("openid") String openid, @Param("carNo") String carNo,@Param("price") BigDecimal price,@Param("paymentType") String paymentType);
 	
-	int updateTmpOrder(@Param("outTradeNo") String outTradeNo);
+	int updateTmpOrder(@Param("outTradeNo") String outTradeNo, @Param("paymentType") String paymentType);
 	
-	Map<String, Object> selectByOrderNumber(@Param("outTradeNo") String outTradeNo);
+	Map<String, Object> selectByOrderNumber(@Param("outTradeNo") String outTradeNo, @Param("paymentType") String paymentType);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/AliMPUserServiceI.java

@@ -0,0 +1,37 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+public interface AliMPUserServiceI {
+	ResponseBean getTemporaryData(String code, String appId, String secret, Integer communityId);
+	
+	ResponseBean getRecordsByOpenid(String openid, Integer communityId);
+	
+	/**
+	 * 临时车下单
+	 *
+	 * @param carNo
+	 * @param actualAmount
+	 * @param communityId
+	 * @param price
+	 * @return
+	 */
+	String aliTmpOrder(String carNo, String actualAmount, Integer communityId, String openid, BigDecimal price);
+	
+	/**
+	 * 更新订单状态
+	 * @param out_trade_no
+	 * @return
+	 */
+	String updateTmpOrder(String out_trade_no);
+	
+	/**
+	 * 根据订单号获取交易信息
+	 * @param out_trade_no
+	 * @return
+	 */
+	Map<String, Object> selectByOrderNumber(String out_trade_no);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/AliMPUserServiceImpl.java

@@ -0,0 +1,164 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.AlipayTradeAppPayModel;
+import com.alipay.api.request.AlipayTradeAppPayRequest;
+import com.alipay.api.response.AlipayTradeAppPayResponse;
+import com.beust.jcommander.internal.Maps;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.perproties.PayNotifyPerproties;
+import com.community.huiju.common.wxmp.WxMPUtil;
+import com.community.huiju.common.wxpay.QaddWxConfig;
+import com.community.huiju.common.wxpay.WXPay;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.dao.TaTemporaryLicenseOrderMapper;
+import com.community.huiju.service.AliMPUserServiceI;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
+
+/**
+ * @author FXF
+ * @date 2019-07-08
+ */
+@Service("aliMPUserService")
+@Slf4j
+public class AliMPUserServiceImpl implements AliMPUserServiceI {
+	
+	@Autowired
+	private TaTemporaryLicenseOrderMapper taTemporaryLicenseOrderMapper;
+	
+	@Autowired
+	private PayNotifyPerproties payNotifyPerproties;
+	
+	@Value("${alipay.APP_PRIVATE_KEY}")
+	private String APP_PRIVATE_KEY;
+	
+	@Value("${alipay.APP_ID}")
+	private String ALI_APP_ID;
+	
+	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
+	private String ALIPAY_PUBLIC_KEY;
+	
+	/**
+	 * 获取缴过费用的临时车牌
+	 * @param code
+	 * @param appId
+	 * @param communityId
+	 * @return
+	 */
+	@Override
+	public ResponseBean getTemporaryData(String code, String appId, String secret,Integer communityId) {
+		ResponseBean responseBean = new ResponseBean();
+		Map<String,Object> resultMap = Maps.newHashMap();
+		String wxresult = WxMPUtil.getWxMPUserInfo(code,appId,secret);
+		JSONObject wxresultJson = JSONObject.parseObject(wxresult);
+		String openid = wxresultJson.getString("openid");
+		//根据openid查询临时车表查看是否存在关联过得车牌 缴费方式 1是支付宝 2是微信支付
+		List<Map<String,Object>> licensePlateList = taTemporaryLicenseOrderMapper.getLicensePlateByOpenid(openid,communityId,"1");
+		resultMap.put("openid",openid);
+		resultMap.put("licensePlateList",licensePlateList);
+		responseBean.addSuccess(resultMap);
+		return responseBean;
+	}
+	
+	/**
+	 * 根据openid获取缴费记录
+	 * @param openid
+	 * @param communityId
+	 * @return
+	 */
+	@Override
+	public ResponseBean getRecordsByOpenid(String openid, Integer communityId) {
+		ResponseBean responseBean = new ResponseBean();
+		//根据openid查询临时车表缴费数据 缴费方式 1是支付宝 2是微信支付
+		List<Map<String,Object>> licensePlateList = taTemporaryLicenseOrderMapper.getLicensePlateRecordsByOpenid(openid,communityId, "1");
+		responseBean.addSuccess(licensePlateList);
+		return responseBean;
+	}
+	
+	/**
+	 * 临时车下单
+	 *
+	 *
+	 * @param carNo
+	 * @param actualAmount
+	 * @return
+	 */
+	@Override
+	public String aliTmpOrder(String carNo, String actualAmount, Integer communityId, String openid, BigDecimal price) {
+		Random random = new Random();
+		String orderNo = String.valueOf(System.currentTimeMillis()) + random.nextInt();
+		//下单
+		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ALI_APP_ID, APP_PRIVATE_KEY, "json", CHARSET_UTF8, ALIPAY_PUBLIC_KEY, "RSA2");
+		//实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+		AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+		//SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+		AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+		model.setBody("临时车缴费");
+		model.setSubject("临时车缴费");
+		model.setOutTradeNo(orderNo);
+		model.setTimeoutExpress("30m");
+		model.setTotalAmount(price.toString());
+		model.setProductCode("QUICK_MSECURITY_PAY");
+		request.setBizModel(model);
+		request.setNotifyUrl(payNotifyPerproties.getAliTmpNotify());
+		try {
+			//这里和普通的接口调用不同，使用的是sdkExecute
+			AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+			//就是orderString 可以直接给客户端请求，无需再做处理。
+			System.out.println(response.getBody());
+			//插入缴费信息到临时车标 缴费方式 1是支付宝 2是微信支付
+			taTemporaryLicenseOrderMapper.saveTmpOrder(communityId,orderNo,actualAmount,openid,carNo,price,"1");
+			return response.getBody();
+		} catch (AlipayApiException e) {
+			e.printStackTrace();
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * 更新订单状态
+	 *
+	 * @param outTradeNo
+	 * @return
+	 */
+	@Override
+	public String updateTmpOrder(String outTradeNo) {
+		//缴费方式 1是支付宝 2是微信支付
+		int size = taTemporaryLicenseOrderMapper.updateTmpOrder(outTradeNo, "1");
+		if (size > 0 ){
+			return "success";
+		}
+		return "fail";
+	}
+	
+	/**
+	 * 根据订单号获取交易信息
+	 *
+	 * @param outTradeNo
+	 * @return
+	 */
+	@Override
+	public Map<String, Object> selectByOrderNumber(String outTradeNo) {
+		//缴费方式 1是支付宝 2是微信支付
+		return taTemporaryLicenseOrderMapper.selectByOrderNumber(outTradeNo, "1");
+	}
+	
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxMPUserServiceImpl.java

@@ -51,8 +51,8 @@ public class WxMPUserServiceImpl implements WxMPUserServiceI {
 		String wxresult = WxMPUtil.getWxMPUserInfo(code,appId,secret);
 		JSONObject wxresultJson = JSONObject.parseObject(wxresult);
 		String openid = wxresultJson.getString("openid");
-		//根据openid查询临时车表查看是否存在关联过得车牌
-		List<Map<String,Object>> licensePlateList = taTemporaryLicenseOrderMapper.getLicensePlateByOpenid(openid,communityId);
+		//根据openid查询临时车表查看是否存在关联过得车牌   缴费方式 1是支付宝 2是微信支付
+		List<Map<String,Object>> licensePlateList = taTemporaryLicenseOrderMapper.getLicensePlateByOpenid(openid,communityId,"2");
 		resultMap.put("openid",openid);
 		resultMap.put("licensePlateList",licensePlateList);
 		responseBean.addSuccess(resultMap);
@@ -68,8 +68,8 @@ public class WxMPUserServiceImpl implements WxMPUserServiceI {
 	@Override
 	public ResponseBean getRecordsByOpenid(String openid, Integer communityId) {
 		ResponseBean responseBean = new ResponseBean();
-		//根据openid查询临时车表缴费数据
-		List<Map<String,Object>> licensePlateList = taTemporaryLicenseOrderMapper.getLicensePlateRecordsByOpenid(openid,communityId);
+		//根据openid查询临时车表缴费数据 缴费方式 1是支付宝 2是微信支付
+		List<Map<String,Object>> licensePlateList = taTemporaryLicenseOrderMapper.getLicensePlateRecordsByOpenid(openid,communityId,"2");
 		responseBean.addSuccess(licensePlateList);
 		return responseBean;
 	}
@@ -108,8 +108,8 @@ public class WxMPUserServiceImpl implements WxMPUserServiceI {
 		if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)){
 			throw new Exception(resp.get("err_code_des"));
 		}
-		//插入缴费信息到临时车标
-		taTemporaryLicenseOrderMapper.saveTmpOrder(communityId,orderNo,actualAmount,openid,carNo,price);
+		//插入缴费信息到临时车标 缴费方式 1是支付宝 2是微信支付
+		taTemporaryLicenseOrderMapper.saveTmpOrder(communityId,orderNo,actualAmount,openid,carNo,price,"2");
 		
 		//第二次重新生成签名
 		Map<String, String> secondSignData = new HashMap<String, String>();
@@ -134,7 +134,8 @@ public class WxMPUserServiceImpl implements WxMPUserServiceI {
 	 */
 	@Override
 	public String updateTmpOrder(String outTradeNo) {
-		int size = taTemporaryLicenseOrderMapper.updateTmpOrder(outTradeNo);
+		//缴费方式 1是支付宝 2是微信支付
+		int size = taTemporaryLicenseOrderMapper.updateTmpOrder(outTradeNo, "2");
 		if (size > 0 ){
 			return "success";
 		}
@@ -149,7 +150,8 @@ public class WxMPUserServiceImpl implements WxMPUserServiceI {
 	 */
 	@Override
 	public Map<String, Object> selectByOrderNumber(String outTradeNo) {
-		return taTemporaryLicenseOrderMapper.selectByOrderNumber(outTradeNo);
+		//缴费方式 1是支付宝 2是微信支付
+		return taTemporaryLicenseOrderMapper.selectByOrderNumber(outTradeNo,  "2");
 	}
 	
 }

CODE/smart-community/app-api/src/main/resources/mapper/TaTemporaryLicenseOrderMapper.xml

@@ -10,6 +10,7 @@
       WHERE
           community_id = #{communityId,jdbcType=INTEGER}
           AND openid = #{openid,jdbcType=VARCHAR}
+          AND payment_type = #{paymentType,jdbcType=VARCHAR}
   </select>
 
   <select id="getLicensePlateRecordsByOpenid" resultType="map">
@@ -25,13 +26,14 @@
           community_id = #{communityId,jdbcType=INTEGER}
           AND openid = #{openid,jdbcType=VARCHAR}
           and order_status = 1
+          AND payment_type = #{paymentType,jdbcType=VARCHAR}
   </select>
 
     <insert id="saveTmpOrder">
     insert into ta_temporary_license_order (community_id, order_number,
       order_status, create_date, payment_type,actual_amount,parking_lot,license_plate,source_from,openid,price
       )
-    values (#{communityId},#{orderNo},2,NOW(),2,#{actualAmount},"银城Q+社区",#{carNo},"临时车微信缴费",#{openid},#{price})
+    values (#{communityId},#{orderNo},2,NOW(),#{paymentType},#{actualAmount},"银城Q+社区",#{carNo},"临时车缴费",#{openid},#{price})
     </insert>
 
     <update id="updateTmpOrder">
@@ -43,6 +45,7 @@
             update_date = now(),
         </set>
         where order_number = #{outTradeNo,jdbcType=VARCHAR}
+        AND payment_type = #{paymentType,jdbcType=VARCHAR}
     </update>
 
     <select id="selectByOrderNumber" resultType="map">
@@ -54,5 +57,6 @@
             ta_temporary_license_order
         WHERE
             order_number = #{outTradeNo,jdbcType=VARCHAR}
+            AND payment_type = #{paymentType,jdbcType=VARCHAR}
     </select>
 </mapper>