合并

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,7 @@ import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "支付宝支付 API", description = "支付宝支付 API")
+@Slf4j
 public class AliPayController {
 	
 	private Logger log = LoggerFactory.getLogger(AliPayController.class);
@@ -56,7 +58,7 @@ public class AliPayController {
 	@ApiOperation(value = "统一下单", notes = "统一下单")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataType = "String", name = "outTradeNo", value = "订单号"),
-			@ApiImplicitParam(paramType = "form", dataType = "String", name = "type", value = "订单类型：type: 类型(car 车缴费, bill 物业缴费)"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "订单类型：type: 类型(car 车缴费, bill 物业缴费)"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
 	@RequestMapping(value = "/aliPayOrder/{outTradeNo}",method = RequestMethod.GET)
 	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, @RequestParam("type") String type, HttpSession session){
@@ -77,12 +79,14 @@ public class AliPayController {
 	@ApiOperation(value = "支付宝手机订单支付完成后回调 物业缴费", notes = "支付宝手机订单支付完成后回调")
 	@RequestMapping(value = "/aliPayBillNotify",method = RequestMethod.POST)
 	public void aliPayBillNotify(HttpServletRequest request, HttpServletResponse response){
+		log.info("支付宝手机订单支付完成后回调 物业缴费");
 		wxNotify(request, Constant.PAY_TYPE_BILL);
 	}
 
 	@ApiOperation(value = "支付宝手机订单支付完成后回调 车缴费", notes = "支付宝手机订单支付完成后回调 车缴费")
 	@RequestMapping(value = "/aliPayCarNotify",method = RequestMethod.POST)
 	public void aliPayCarNotify(HttpServletRequest request, HttpServletResponse response){
+		log.info("支付宝手机订单支付完成后回调 车缴费");
 		wxNotify(request, Constant.PAY_TYPE_CAR);
 	}
 
@@ -92,7 +96,7 @@ public class AliPayController {
 	 * @param type
 	 */
 	private void wxNotify(HttpServletRequest request, String type) {
-		System.out.println("alipay result  start =======");
+		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();) {

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

@@ -6,7 +6,7 @@ import java.util.Map;
 
 public interface AliPayServiceI {
 	/**
-	 * 微信支付统一下单
+	 * 支付宝支付统一下单
 	 * @return
 	 * @param outTradeNo
 	 * @param type  类型(car 车缴费, bill 物业缴费)

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

@@ -495,9 +495,8 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			TaUserLicense taUserLicense = null;
 			if (null != licenseData && licenseData instanceof TaUserLicense) {
 				taUserLicense = (TaUserLicense) licenseData;
+				e.setExpireDate(taUserLicense.getExpireDate());
 			}
-
-			e.setExpireDate(taUserLicense.getExpireDate());
 			e.setPaymentType(pay_type);
 
 			taUserLicenseOrderMapper.updateByPrimaryKeySelective(e);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseOrderServiceImpl.java

@@ -46,7 +46,7 @@ public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrde
         page.setSize(pageSize);
         page.setCurrent(pageNum);
         QueryWrapper<TaUserLicenseOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(id != null ,"id", id);
+        queryWrapper.like(id != null ,"id", id);
         queryWrapper.like(StringUtils.isNotBlank(licensePlate), "license_plate", licensePlate);
         queryWrapper.like(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
         queryWrapper.like(StringUtils.isNotBlank(paymentName), "payment_name", paymentName);

VUECODE/smart-property-manage/src/views/bill/license/index.vue

@@ -83,7 +83,7 @@
         prop="updateDate"
         align="center"
         label="缴费完成时间">
-        <template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template>
+        <template slot-scope="scope">{{ formatDateTime(scope.row.updateDate) }}</template>
       </el-table-column>
     </el-table>
     <div class="block-page">
@@ -147,6 +147,20 @@ export default {
       // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
     },
+    formatDateTime(val) {
+      if (val === null || val === '') {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      var hour = value.getHours()
+      var minutes = value.getMinutes()
+      var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
     showPayType(obj) {
       let str = ''
       switch (obj) {