clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
HH 2022-05-17 21:19:48 +08:00
parent 6230095ebe fcc321303c
commit 90b45a05bc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml
View File

@ -22,10 +22,10 @@
<sql id="selectCustomerAddress">
SELECT customer_address_id, customer_id, name, phone, province_id, city_id, country_id, status,
address, create_by, create_time, remark
address, create_by, create_time, remark, is_default
FROM customer_address
</sql>
<select id="getCustomerAddressList" resultMap="CustomerAddressResult">
<include refid="selectCustomerAddress" />
</select>
@ -69,7 +69,7 @@
<if test="countryId != null and countryId != 0">country_id,</if>
<if test="status != null and status != ''">status,</if>
<if test="address != null and address != ''">address,</if>
<if test="isDefault != null and isDefault != 0">is_default,</if>
<if test="isDefault != null">is_default,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
create_time
@ -90,7 +90,7 @@
</insert>
<update id="updateCustomerAddress" parameterType="com.ghy.customer.domain.CustomerAddress">
update costomer_address
update customer_address
<set>
<if test="name != null and name != ''">name = #{name},</if>
<if test="phone != null and phone != ''">phone = #{phone},</if>
@ -98,7 +98,7 @@
<if test="cityId != null and cityId != 0">city_id = #{cityId},</if>
<if test="countryId != null and countryId != 0">country_id = #{countryId},</if>
<if test="address != null and address != ''">address = #{address},</if>
<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
<if test="isDefault != null">is_default = #{isDefault},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@ -107,4 +107,4 @@
where customer_address_id = #{customerAddressId}
</update>
</mapper>
</mapper>

4
ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java
View File

@ -1,5 +1,6 @@
package com.ghy.payment.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ghy.common.annotation.Excel;
import com.ghy.common.core.domain.BaseEntity;
import lombok.Data;
@ -40,6 +41,7 @@ public class FinancialMaster extends BaseEntity {
private Integer payStatus;
@Excel(name = "付款时间", cellType = Excel.ColumnType.STRING)
private String payTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Data payTime;
}