Merge remote-tracking branch 'origin/master'

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlworder/entity/HlwOrder.java

@@ -50,16 +50,16 @@ public class HlwOrder implements Serializable {
      * 订单时间（如无需特定订单时间情况下，此字段存创建时间就可以），业务回显展示此字段
      */
     @Excel(name = "订单时间（如无需特定订单时间情况下，此字段存创建时间就可以），业务回显展示此字段", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "订单时间（如无需特定订单时间情况下，此字段存创建时间就可以），业务回显展示此字段")
     private Date orderTime;
 
     /**
      * 创建时间
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
     /**
@@ -70,8 +70,8 @@ public class HlwOrder implements Serializable {
     /**
      * 更新时间
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
     /**

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/entity/HlwPayment.java

@@ -103,8 +103,8 @@ public class HlwPayment implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
     /**

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/entity/HlwPaymentDetail.java

@@ -112,8 +112,8 @@ public class HlwPaymentDetail implements Serializable {
     /**
      * 付款时间（向银行提交付款按钮的时间）
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "付款时间（向银行提交付款按钮的时间）")
     private java.util.Date paymentTime;
     /**
@@ -131,8 +131,8 @@ public class HlwPaymentDetail implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
     /**
@@ -143,8 +143,8 @@ public class HlwPaymentDetail implements Serializable {
     /**
      * 更新时间
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
     /**

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/mapper/xml/HlwPaymentMapper.xml

@@ -64,7 +64,7 @@
 			</if>
         </where>
 		group by a.id
-        ORDER BY a.create_time DESC, a.id ASC
+        ORDER BY a.create_time DESC, a.id DESC
     </select>
 
     <insert id="savePayment">
@@ -450,7 +450,7 @@
 			</if>
 		</where>
 		group by a.id
-		ORDER BY a.create_time DESC, a.id ASC
+		ORDER BY a.create_time DESC, a.id DESC
 	</select>
 
 

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/service/impl/HlwPaymentServiceImpl.java

@@ -41,6 +41,8 @@ import org.jeecg.modules.hlwtax.entity.HlwTax;
 import org.jeecg.modules.hlwtax.entity.HlwTaxRate;
 import org.jeecg.modules.hlwtax.service.IHlwTaxRateService;
 import org.jeecg.modules.hlwtax.service.IHlwTaxService;
+import org.jeecg.modules.hlwuser.entity.HlwUser;
+import org.jeecg.modules.hlwuser.service.IHlwUserService;
 import org.jeecg.modules.utils.HlwConstant;
 import org.jeecg.modules.utils.PayCommon;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,6 +93,8 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
     private IHlwCpSubcontractorService hlwCpSubcontractorService;
     @Autowired
     private IHlwOrderService hlwOrderService;
+    @Autowired
+    private IHlwUserService hlwUserService;
 
     @Override
     public Page<HlwPayment> pageList(Page<HlwPayment> page, HlwPayment hlwPayment, QueryWrapper<HlwPayment> queryWrapper) {
@@ -430,6 +434,12 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
                     hlwPaymentDetail.setPaymentBy(sysUser.getUsername());
                     hlwPaymentDetail.setUpdateTime(new Date());
                     hlwPaymentDetailService.updateById(hlwPaymentDetail);
+                    //用户信息
+                    HlwUser hlwUser = hlwUserService.getByIdcardNumberAndApplicationId(hlwPaymentDetail.getIdcardNumber(), hlwPaymentEntity.getApplicationId());
+                    if (hlwUser != null) {
+                        hlwUser.setLastPaymentCompany(hlwCompany.getCompanyName());
+                        hlwUserService.updateById(hlwUser);
+                    }
                     //订单信息
                     HlwOrder hlwOrder = hlwOrderService.getById(hlwPaymentDetail.getOrderId());
                     if (hlwOrder != null) {
@@ -674,6 +684,12 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
                     hlwPaymentDetail.setPaymentBy(sysUser.getUsername());
                     hlwPaymentDetail.setUpdateTime(new Date());
                     hlwPaymentDetailService.updateById(hlwPaymentDetail);
+                    //用户信息
+                    HlwUser hlwUser = hlwUserService.getByIdcardNumberAndApplicationId(hlwPaymentDetail.getIdcardNumber(), hlwPaymentEntity.getApplicationId());
+                    if (hlwUser != null) {
+                        hlwUser.setLastPaymentCompany(hlwCompany.getCompanyName());
+                        hlwUserService.updateById(hlwUser);
+                    }
                     //订单信息
                     HlwOrder hlwOrder = hlwOrderService.getById(hlwPaymentDetail.getOrderId());
                     if (hlwOrder != null) {

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwuser/entity/HlwUser.java

@@ -119,7 +119,6 @@ public class HlwUser implements Serializable {
     @TableField(exist = false)
     private Integer contractUpload;  //0:未上传 1：已上传
 
-    @TableField(exist = false)
     private String lastPaymentCompany;
 
     @TableField(exist = false)